diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-16 20:13:28 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-16 20:13:28 +0000 |
| commit | 5c49cd8e07ca0f676f759bfb8e1e4a94636e2af6 (patch) | |
| tree | d8d453ffd3502d82418494650e44a6dae9ff5359 /cfg-common.h | |
| parent | 79102684ed09aef64829bb0ef67469dfccf5afe3 (diff) | |
| download | mpv-5c49cd8e07ca0f676f759bfb8e1e4a94636e2af6.tar.bz2 mpv-5c49cd8e07ca0f676f759bfb8e1e4a94636e2af6.tar.xz | |
this is a combo patch that:
1) adds an experimental TS demuxer to mplayer
2) adds an input (streaming) interface from DVB cards.
It compiles and runs with the following versions of the drivers:
dvb-kernel (HEAD) (with stock kernel 2.4.20) and 0.9.4 (with kernel 2.4.18)
patch by Nico <nsabbi@libero.it>
some cleanups, ts demuxer fixes by me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9611 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-common.h')
| -rw-r--r-- | cfg-common.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/cfg-common.h b/cfg-common.h index ac222efd6f..7f5c0ce8f7 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -64,8 +64,8 @@ {"forceidx", &index_mode, CONF_TYPE_FLAG, 0, -1, 2, NULL}, // select audio/videosubtitle stream - {"aid", &audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL}, - {"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL}, + {"aid", &audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 8192, NULL}, + {"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 8192, NULL}, {"sid", &dvdsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL}, { "hr-mp3-seek", &hr_mp3_seek, CONF_TYPE_FLAG, 0, 0, 1, NULL }, @@ -94,6 +94,10 @@ {"tv", "MPlayer was compiled without TV Interface support\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, #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}, +#endif + // ------------------------- a-v sync options -------------------- @@ -164,6 +168,7 @@ {"flip", &flip, CONF_TYPE_FLAG, 0, -1, 1, NULL}, {"noflip", &flip, CONF_TYPE_FLAG, 0, -1, 0, NULL}, + {"tsfastparse", &ts_fastparse, CONF_TYPE_INT, 0, 0, 0, NULL}, #ifdef USE_LIBAVCODEC {"lavdopts", lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, @@ -243,6 +248,7 @@ extern config_t cdda_opts[]; extern char* audio_stream; extern char* sub_stream; extern int demuxer_type, audio_demuxer_type, sub_demuxer_type; +extern int ts_fastparse; #include "libmpdemux/tv.h" @@ -290,6 +296,12 @@ struct config tvopts_conf[]={ }; #endif +#ifdef HAS_DVBIN_SUPPORT +#include "libmpdemux/dvbin.h" +extern struct config dvbin_opts_conf[]; +#endif + + extern int sws_chr_vshift; extern int sws_chr_hshift; extern float sws_chr_gblur; |