summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
Diffstat (limited to 'stream')
-rw-r--r--stream/tv.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/stream/tv.c b/stream/tv.c
index 6921fd0f6b..80dd53e6a1 100644
--- a/stream/tv.c
+++ b/stream/tv.c
@@ -713,8 +713,8 @@ static demuxer_t* demux_open_tv(demuxer_t *demuxer)
/* get IMAGE FORMAT */
int fourcc;
funcs->control(tvh->priv, TVI_CONTROL_VID_GET_FORMAT, &fourcc);
- sh_video->format = MP_FOURCC_RAWVIDEO;
- sh_video->imgfmt = fourcc;
+ sh_video->gsh->codec = "rawvideo";
+ sh_video->format = fourcc;
/* set FPS and FRAMETIME */
@@ -758,7 +758,6 @@ static demuxer_t* demux_open_tv(demuxer_t *demuxer)
if (tvh->tv_param->noaudio == 0 && funcs->control(tvh->priv, TVI_CONTROL_IS_AUDIO, 0) == TVI_CONTROL_TRUE)
{
int audio_format;
- int sh_audio_format;
char buf[128];
/* yeah, audio is present */
@@ -779,7 +778,6 @@ static demuxer_t* demux_open_tv(demuxer_t *demuxer)
case AF_FORMAT_S16_BE:
case AF_FORMAT_S32_LE:
case AF_FORMAT_S32_BE:
- sh_audio_format = 0x1; /* PCM */
break;
case AF_FORMAT_MPEG2:
default:
@@ -797,8 +795,8 @@ static demuxer_t* demux_open_tv(demuxer_t *demuxer)
funcs->control(tvh->priv, TVI_CONTROL_AUD_GET_CHANNELS,
&sh_audio->channels);
- sh_audio->format = sh_audio_format;
- sh_audio->sample_format = audio_format;
+ sh_audio->gsh->codec = "mp-pcm";
+ sh_audio->format = audio_format;
sh_audio->i_bps = sh_audio->o_bps =
sh_audio->samplerate * sh_audio->samplesize *