summaryrefslogtreecommitdiffstats
path: root/cfg-common.h
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-08-11 00:02:46 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-08-11 00:02:46 +0000
commitd891bc11ccbe529beb532f44c0fc837d5dbb5f3f (patch)
tree00d6baa4f49709d223730b991b0c179f27850301 /cfg-common.h
parenta3b1944cc63a540c05d9368ab05afc80f36da0d9 (diff)
downloadmpv-d891bc11ccbe529beb532f44c0fc837d5dbb5f3f.tar.bz2
mpv-d891bc11ccbe529beb532f44c0fc837d5dbb5f3f.tar.xz
this patch fixes
1) some bugs introduced in the tuner autodetection and in the channel-parsing functions, 3) retries reading when the mplayer/mencoder don't read fast enough (sooner it exited) but especially 4) makes the stream compliant with the new, modular stream api (the one currently in CVS is not and is totally unreachable). [and maybe more, next time please include cvslog in patch! -- A'rpi] patch by Nico <nsabbi@libero.it> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10561 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-common.h')
-rw-r--r--cfg-common.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/cfg-common.h b/cfg-common.h
index 187c1bb4fa..e89bee0122 100644
--- a/cfg-common.h
+++ b/cfg-common.h
@@ -109,7 +109,7 @@
#endif
{"vivo", vivoopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
#ifdef HAS_DVBIN_SUPPORT
- {"dvbin", dvbin_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
+ {"dvbin", dvbin_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
#endif
@@ -328,7 +328,7 @@ struct config tvopts_conf[]={
#ifdef HAS_DVBIN_SUPPORT
#include "libmpdemux/dvbin.h"
-extern struct config dvbin_opts_conf[];
+extern m_config_t dvbin_opts_conf[];
#endif
extern int audio_stream_cache;