summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-05-23 14:53:11 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-05-23 14:53:11 +0000
commit4a7a84962aea9876a19fdb9995178aa440853b47 (patch)
tree6df7a57d56ca772969aa9a3f17f49de140391246 /libmpdemux
parent6d85762976aab1579239d92ece5a14daae84ea55 (diff)
downloadmpv-4a7a84962aea9876a19fdb9995178aa440853b47.tar.bz2
mpv-4a7a84962aea9876a19fdb9995178aa440853b47.tar.xz
applied 64bit patch from Ulrich Hecht <uli at suse dot de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6162 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/tv.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/libmpdemux/tv.c b/libmpdemux/tv.c
index 458fe1e949..34f7d423fd 100644
--- a/libmpdemux/tv.c
+++ b/libmpdemux/tv.c
@@ -328,7 +328,8 @@ int demux_open_tv(demuxer_t *demuxer, tvi_handle_t *tvh)
case AFMT_MPEG:
case AFMT_AC3:
default:
- mp_msg(MSGT_TV, MSGL_ERR, "Audio type '%s' unsupported!\n", audio_out_format_name(audio_format));
+ mp_msg(MSGT_TV, MSGL_ERR, "Audio type '%s (%x)' unsupported!\n",
+ audio_out_format_name(audio_format), audio_format);
goto no_audio;
}
@@ -371,17 +372,21 @@ no_audio:
}
/* ================== STREAM_TV ===================== */
+tvi_handle_t *tvi_init_dummy(char *device);
+tvi_handle_t *tvi_init_v4l(char *device);
+tvi_handle_t *tvi_init_bsdbt848(char *device);
+
tvi_handle_t *tv_begin(void)
{
if (!strcmp(tv_param_driver, "dummy"))
- return (tvi_handle_t *)tvi_init_dummy(tv_param_device);
+ return tvi_init_dummy(tv_param_device);
#ifdef HAVE_TV_V4L
if (!strcmp(tv_param_driver, "v4l"))
- return (tvi_handle_t *)tvi_init_v4l(tv_param_device);
+ return tvi_init_v4l(tv_param_device);
#endif
#ifdef HAVE_TV_BSDBT848
if (!strcmp(tv_param_driver, "bsdbt848"))
- return (tvi_handle_t *)tvi_init_bsdbt848(tv_param_device);
+ return tvi_init_bsdbt848(tv_param_device);
#endif
mp_msg(MSGT_TV, MSGL_ERR, "No such driver: %s\n", tv_param_driver);