[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[259] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[259] mplayerxp
|
From: <nic...@us...> - 2012-10-30 13:43:37
|
Revision: 259
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=259&view=rev
Author: nickols_k
Date: 2012-10-30 13:43:23 +0000 (Tue, 30 Oct 2012)
Log Message:
-----------
remove unused field + minor constantization
Modified Paths:
--------------
mplayerxp/cfg-mplayer.h
mplayerxp/input/input.c
mplayerxp/libao2/ao_alsa9.c
mplayerxp/libmpcodecs/ad_a52.c
mplayerxp/libmpcodecs/ad_acm.c
mplayerxp/libmpcodecs/ad_dca.c
mplayerxp/libmpcodecs/ad_dmo.c
mplayerxp/libmpcodecs/ad_dshow.c
mplayerxp/libmpcodecs/ad_dvdpcm.c
mplayerxp/libmpcodecs/ad_faad.c
mplayerxp/libmpcodecs/ad_ffmp3.c
mplayerxp/libmpcodecs/ad_hwac3.c
mplayerxp/libmpcodecs/ad_libdv.c
mplayerxp/libmpcodecs/ad_mp3.c
mplayerxp/libmpcodecs/ad_null.c
mplayerxp/libmpcodecs/ad_pcm.c
mplayerxp/libmpcodecs/ad_qtaudio.c
mplayerxp/libmpcodecs/ad_real.c
mplayerxp/libmpcodecs/ad_twin.c
mplayerxp/libmpcodecs/ad_vorbis.c
mplayerxp/libmpcodecs/vd_divx4.c
mplayerxp/libmpcodecs/vd_dmo.c
mplayerxp/libmpcodecs/vd_dshow.c
mplayerxp/libmpcodecs/vd_ffmpeg.c
mplayerxp/libmpcodecs/vd_huffyuv.c
mplayerxp/libmpcodecs/vd_libdv.c
mplayerxp/libmpcodecs/vd_libmpeg2.c
mplayerxp/libmpcodecs/vd_mpegpes.c
mplayerxp/libmpcodecs/vd_null.c
mplayerxp/libmpcodecs/vd_nuv.c
mplayerxp/libmpcodecs/vd_qtvideo.c
mplayerxp/libmpcodecs/vd_raw.c
mplayerxp/libmpcodecs/vd_real.c
mplayerxp/libmpcodecs/vd_theora.c
mplayerxp/libmpcodecs/vd_vfw.c
mplayerxp/libmpcodecs/vd_xanim.c
mplayerxp/libmpcodecs/vd_xvid.c
mplayerxp/libmpconf/cfgparser.c
mplayerxp/libmpconf/cfgparser.h
mplayerxp/libmpconf/m_option.h
mplayerxp/libmpdemux/cdda.c
mplayerxp/libmpdemux/demux_audio.c
mplayerxp/libmpdemux/demux_avi.c
mplayerxp/libmpdemux/demux_lavf.c
mplayerxp/libmpdemux/demux_rawaudio.c
mplayerxp/libmpdemux/demux_rawvideo.c
mplayerxp/libmpdemux/demux_viv.c
mplayerxp/libmpdemux/demuxer.c
mplayerxp/libmpdemux/mrl.c
mplayerxp/libmpdemux/mrl.h
mplayerxp/libmpdemux/s_dvdnav.c
mplayerxp/libmpdemux/s_tv.c
mplayerxp/libvo/vo_fbdev.c
Modified: mplayerxp/cfg-mplayer.h
===================================================================
--- mplayerxp/cfg-mplayer.h 2012-10-30 09:09:49 UTC (rev 258)
+++ mplayerxp/cfg-mplayer.h 2012-10-30 13:43:23 UTC (rev 259)
@@ -73,260 +73,260 @@
*/
static const config_t xpcore_config[]={
- {"xp", &mp_conf.xp, CONF_TYPE_INT, CONF_RANGE, 0, 4, NULL, "starts MPlayerXP in multi-thread and multi-buffer XP mode"},
- {"dump", &mp_conf.stream_dump, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies dump type and name for the dump of stream"},
- {"gomp", &mp_conf.gomp, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables usage of OpenMP extensions"},
- {"nogomp", &mp_conf.gomp, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables usage of OpenMP extensions"},
- {"da_buffs", &vo_conf.da_buffs, CONF_TYPE_INT, CONF_RANGE, 4, 1024, NULL, "specifies number of buffers for decoding-ahead in XP mode"},
- {"cache", &mp_conf.s_cache_size, CONF_TYPE_INT, CONF_RANGE, 4, 65536, NULL,"specifies amount of memory for precaching a file/URL"},
- {"nocache", &mp_conf.s_cache_size, CONF_TYPE_FLAG, 0, 1, 0, NULL,"disables precaching a file/URL"},
- {"autoq", &mp_conf.autoq, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL, "dynamically changes the level of postprocessing depending on spare CPU time available"},
- {"speed", &mp_conf.playbackspeed_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 100.0, NULL, "sets playback speed factor"},
- {"benchmark", &mp_conf.benchmark, CONF_TYPE_FLAG, 0, 0, 1, NULL, "performs benchmarking to estimate performance of MPlayerXP"},
- {NULL, NULL, 0, 0, 0, 0, NULL,NULL},
+ {"xp", &mp_conf.xp, CONF_TYPE_INT, CONF_RANGE, 0, 4, "starts MPlayerXP in multi-thread and multi-buffer XP mode"},
+ {"dump", &mp_conf.stream_dump, CONF_TYPE_STRING, 0, 0, 0, "specifies dump type and name for the dump of stream"},
+ {"gomp", &mp_conf.gomp, CONF_TYPE_FLAG, 0, 0, 1, "enables usage of OpenMP extensions"},
+ {"nogomp", &mp_conf.gomp, CONF_TYPE_FLAG, 0, 1, 0, "disables usage of OpenMP extensions"},
+ {"da_buffs", &vo_conf.da_buffs, CONF_TYPE_INT, CONF_RANGE, 4, 1024, "specifies number of buffers for decoding-ahead in XP mode"},
+ {"cache", &mp_conf.s_cache_size, CONF_TYPE_INT, CONF_RANGE, 4, 65536, "specifies amount of memory for precaching a file/URL"},
+ {"nocache", &mp_conf.s_cache_size, CONF_TYPE_FLAG, 0, 1, 0, "disables precaching a file/URL"},
+ {"autoq", &mp_conf.autoq, CONF_TYPE_INT, CONF_RANGE, 0, 100, "dynamically changes the level of postprocessing depending on spare CPU time available"},
+ {"speed", &mp_conf.playbackspeed_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 100.0, "sets playback speed factor"},
+ {"benchmark", &mp_conf.benchmark, CONF_TYPE_FLAG, 0, 0, 1, "performs benchmarking to estimate performance of MPlayerXP"},
+ {NULL, NULL, 0, 0, 0, 0, NULL},
};
#ifdef HAVE_STREAMING
static const config_t net_config[]={
- {"ipv4", &network_prefer_ipv4, CONF_TYPE_FLAG, 0, 0, 1, NULL, "forces mplayerxp to use IPv4 protocol over network"},
+ {"ipv4", &network_prefer_ipv4, CONF_TYPE_FLAG, 0, 0, 1, "forces mplayerxp to use IPv4 protocol over network"},
#ifdef HAVE_AF_INET6
- {"ipv6", &network_prefer_ipv4, CONF_TYPE_FLAG, 0, 1, 0, NULL, "forces mplayerxp to use IPv6 protocol over network"},
+ {"ipv6", &network_prefer_ipv4, CONF_TYPE_FLAG, 0, 1, 0, "forces mplayerxp to use IPv6 protocol over network"},
#else
{"ipv6", "MPlayerXP was compiled without IPv6 support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
#endif /* HAVE_AF_INET6 */
- {"ipv4-only-proxy", &network_ipv4_only_proxy, CONF_TYPE_FLAG, 0, 0, 1, NULL, "skip the proxy for IPv6 addresses"},
- {"user", &network_username, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies username for HTTP authentication"},
- {"passwd", &network_password, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies password for HTTP authentication"},
- {"bandwidth", &network_bandwidth, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL, "specifies the maximum bandwidth for network streaming"},
- {"user-agent", &network_useragent, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies string as user agent for HTTP streaming"},
- {"cookies", &network_cookies_enabled, CONF_TYPE_FLAG, 0, 0, 1, NULL,"send cookies when making HTTP requests"},
- {"cookies-file", &cookies_file, CONF_TYPE_STRING, 0, 0, 0, NULL,"Read HTTP cookies from file"},
- {NULL, NULL, 0, 0, 0, 0, NULL,NULL},
+ {"ipv4-only-proxy", &network_ipv4_only_proxy, CONF_TYPE_FLAG, 0, 0, 1, "skip the proxy for IPv6 addresses"},
+ {"user", &network_username, CONF_TYPE_STRING, 0, 0, 0, "specifies username for HTTP authentication"},
+ {"passwd", &network_password, CONF_TYPE_STRING, 0, 0, 0, "specifies password for HTTP authentication"},
+ {"bandwidth", &network_bandwidth, CONF_TYPE_INT, CONF_MIN, 0, 0, "specifies the maximum bandwidth for network streaming"},
+ {"user-agent", &network_useragent, CONF_TYPE_STRING, 0, 0, 0, "specifies string as user agent for HTTP streaming"},
+ {"cookies", &network_cookies_enabled, CONF_TYPE_FLAG, 0, 0, 1, "send cookies when making HTTP requests"},
+ {"cookies-file", &cookies_file, CONF_TYPE_STRING, 0, 0, 0, "Read HTTP cookies from file"},
+ {NULL, NULL, 0, 0, 0, 0, NULL},
};
#endif
#if defined( ARCH_X86 ) || defined(ARCH_X86_64)
static const config_t cpu_config[]={
- {"simd", &x86.simd, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables using of SIMD extensions of CPU"},
- {"nosimd", &x86.simd, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables using of SIMD extensions of CPU"},
- {"mmx", &x86.mmx, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables using of MMX extensions of CPU"},
- {"nommx", &x86.mmx, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables using of MMX extensions of CPU"},
- {"mmx2", &x86.mmx2, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables using of MMX2 extensions of CPU"},
- {"nommx2", &x86.mmx2, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables using of MMX2 extensions of CPU"},
- {"3dnow", &x86._3dnow, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables using of 3DNow! extensions of CPU"},
- {"no3dnow", &x86._3dnow, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables using of 3DNow! extensions of CPU"},
- {"3dnow2", &x86._3dnow2, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables using of 3DNow-2! extensions of CPU"},
- {"no3dnow2", &x86._3dnow2, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables using of 3DNow-2! extensions of CPU"},
- {"sse", &x86.sse, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables using of SSE extensions of CPU"},
- {"nosse", &x86.sse, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables using of SSE extensions of CPU"},
- {"sse2", &x86.sse2, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables using of SSE2 extensions of CPU"},
- {"nosse2", &x86.sse2, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables using of SSE2 extensions of CPU"},
- {"sse3", &x86.sse3, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables using of SSE3 extensions of CPU"},
- {"nosse3", &x86.sse3, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables using of SSE3 extensions of CPU"},
- {"ssse3", &x86.ssse3, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables using of SSSE3 extensions of CPU"},
- {"nossse3", &x86.ssse3, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables using of SSSE3 extensions of CPU"},
- {"sse41", &x86.sse41, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables using of SSE41 extensions of CPU"},
- {"nosse41", &x86.sse41, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables using of SSE41 extensions of CPU"},
- {"sse42", &x86.sse42, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables using of SSE42 extensions of CPU"},
- {"nosse42", &x86.sse42, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables using of SSE42 extensions of CPU"},
- {"aes", &x86.aes, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables using of AES extensions of CPU"},
- {"noaes", &x86.aes, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables using of AES extensions of CPU"},
- {"avx", &x86.avx, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables using of AVX extensions of CPU"},
- {"noavx", &x86.avx, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables using of AVX extensions of CPU"},
- {"fma", &x86.fma, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables using of FMA extensions of CPU"},
- {"nofma", &x86.fma, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables using of FMA extensions of CPU"},
- {NULL, NULL, 0, 0, 0, 0, NULL,NULL},
+ {"simd", &x86.simd, CONF_TYPE_FLAG, 0, 0, 1, "enables using of SIMD extensions of CPU"},
+ {"nosimd", &x86.simd, CONF_TYPE_FLAG, 0, 1, 0, "disables using of SIMD extensions of CPU"},
+ {"mmx", &x86.mmx, CONF_TYPE_FLAG, 0, 0, 1, "enables using of MMX extensions of CPU"},
+ {"nommx", &x86.mmx, CONF_TYPE_FLAG, 0, 1, 0, "disables using of MMX extensions of CPU"},
+ {"mmx2", &x86.mmx2, CONF_TYPE_FLAG, 0, 0, 1, "enables using of MMX2 extensions of CPU"},
+ {"nommx2", &x86.mmx2, CONF_TYPE_FLAG, 0, 1, 0, "disables using of MMX2 extensions of CPU"},
+ {"3dnow", &x86._3dnow, CONF_TYPE_FLAG, 0, 0, 1, "enables using of 3DNow! extensions of CPU"},
+ {"no3dnow", &x86._3dnow, CONF_TYPE_FLAG, 0, 1, 0, "disables using of 3DNow! extensions of CPU"},
+ {"3dnow2", &x86._3dnow2, CONF_TYPE_FLAG, 0, 0, 1, "enables using of 3DNow-2! extensions of CPU"},
+ {"no3dnow2", &x86._3dnow2, CONF_TYPE_FLAG, 0, 1, 0, "disables using of 3DNow-2! extensions of CPU"},
+ {"sse", &x86.sse, CONF_TYPE_FLAG, 0, 0, 1, "enables using of SSE extensions of CPU"},
+ {"nosse", &x86.sse, CONF_TYPE_FLAG, 0, 1, 0, "disables using of SSE extensions of CPU"},
+ {"sse2", &x86.sse2, CONF_TYPE_FLAG, 0, 0, 1, "enables using of SSE2 extensions of CPU"},
+ {"nosse2", &x86.sse2, CONF_TYPE_FLAG, 0, 1, 0, "disables using of SSE2 extensions of CPU"},
+ {"sse3", &x86.sse3, CONF_TYPE_FLAG, 0, 0, 1, "enables using of SSE3 extensions of CPU"},
+ {"nosse3", &x86.sse3, CONF_TYPE_FLAG, 0, 1, 0, "disables using of SSE3 extensions of CPU"},
+ {"ssse3", &x86.ssse3, CONF_TYPE_FLAG, 0, 0, 1, "enables using of SSSE3 extensions of CPU"},
+ {"nossse3", &x86.ssse3, CONF_TYPE_FLAG, 0, 1, 0, "disables using of SSSE3 extensions of CPU"},
+ {"sse41", &x86.sse41, CONF_TYPE_FLAG, 0, 0, 1, "enables using of SSE41 extensions of CPU"},
+ {"nosse41", &x86.sse41, CONF_TYPE_FLAG, 0, 1, 0, "disables using of SSE41 extensions of CPU"},
+ {"sse42", &x86.sse42, CONF_TYPE_FLAG, 0, 0, 1, "enables using of SSE42 extensions of CPU"},
+ {"nosse42", &x86.sse42, CONF_TYPE_FLAG, 0, 1, 0, "disables using of SSE42 extensions of CPU"},
+ {"aes", &x86.aes, CONF_TYPE_FLAG, 0, 0, 1, "enables using of AES extensions of CPU"},
+ {"noaes", &x86.aes, CONF_TYPE_FLAG, 0, 1, 0, "disables using of AES extensions of CPU"},
+ {"avx", &x86.avx, CONF_TYPE_FLAG, 0, 0, 1, "enables using of AVX extensions of CPU"},
+ {"noavx", &x86.avx, CONF_TYPE_FLAG, 0, 1, 0, "disables using of AVX extensions of CPU"},
+ {"fma", &x86.fma, CONF_TYPE_FLAG, 0, 0, 1, "enables using of FMA extensions of CPU"},
+ {"nofma", &x86.fma, CONF_TYPE_FLAG, 0, 1, 0, "disables using of FMA extensions of CPU"},
+ {NULL, NULL, 0, 0, 0, 0, NULL},
};
#endif
static const config_t osd_config[]={
- {"level", &mp_conf.osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 2 , NULL, "specifies initial mode of the OSD"},
+ {"level", &mp_conf.osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 2 , "specifies initial mode of the OSD"},
#ifdef USE_OSD
- {"font", &mp_conf.font_name, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies an alternative directory of font.desc location"},
- {"ffactor", &mp_conf.font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0, NULL, "specifies resampling of alphamap of the font"},
- {"spualign", &spu_alignment, CONF_TYPE_INT, CONF_RANGE, -1, 2, NULL, "specifies align position of SPU (DVD-VOBsub) subtitles"},
- {"spuaa", &spu_aamode, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL, "specifies antialiasing/scaling mode for SPU"},
- {"spugauss", &spu_gaussvar, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 3.0, NULL, "specifies variance parameter of gaussian for -spuaa"},
+ {"font", &mp_conf.font_name, CONF_TYPE_STRING, 0, 0, 0, "specifies an alternative directory of font.desc location"},
+ {"ffactor", &mp_conf.font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0, "specifies resampling of alphamap of the font"},
+ {"spualign", &spu_alignment, CONF_TYPE_INT, CONF_RANGE, -1, 2, "specifies align position of SPU (DVD-VOBsub) subtitles"},
+ {"spuaa", &spu_aamode, CONF_TYPE_INT, CONF_RANGE, 0, 31, "specifies antialiasing/scaling mode for SPU"},
+ {"spugauss", &spu_gaussvar, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 3.0, "specifies variance parameter of gaussian for -spuaa"},
#endif
- {NULL, NULL, 0, 0, 0, 0, NULL,NULL},
+ {NULL, NULL, 0, 0, 0, 0, NULL},
};
static const config_t veq_config[]={
- {"brightness",&vo_conf.gamma.brightness, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL, "specifies brightness-level for output image"},
- {"saturation",&vo_conf.gamma.saturation, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL, "specifies saturation-level for output image"},
- {"contrast",&vo_conf.gamma.contrast, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL, "specifies contrast-level for output image"},
- {"hue",&vo_conf.gamma.hue, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL, "specifies hue of gamma-correction for output image"},
- {"red",&vo_conf.gamma.red_intensity, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL, "specifies intensity of red component for output image"},
- {"green",&vo_conf.gamma.green_intensity, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL, "specifies intensity of green component for output image"},
- {"blue",&vo_conf.gamma.blue_intensity, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, NULL, "specifies intensity of blue component for output image"},
- {NULL, NULL, 0, 0, 0, 0, NULL,NULL},
+ {"brightness",&vo_conf.gamma.brightness, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, "specifies brightness-level for output image"},
+ {"saturation",&vo_conf.gamma.saturation, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, "specifies saturation-level for output image"},
+ {"contrast",&vo_conf.gamma.contrast, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, "specifies contrast-level for output image"},
+ {"hue",&vo_conf.gamma.hue, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, "specifies hue of gamma-correction for output image"},
+ {"red",&vo_conf.gamma.red_intensity, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, "specifies intensity of red component for output image"},
+ {"green",&vo_conf.gamma.green_intensity, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, "specifies intensity of green component for output image"},
+ {"blue",&vo_conf.gamma.blue_intensity, CONF_TYPE_INT, CONF_RANGE, -1000, 1000, "specifies intensity of blue component for output image"},
+ {NULL, NULL, 0, 0, 0, 0, NULL},
};
static const config_t avsync_config[]={
- {"framedrop", &mp_conf.frame_dropping, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables frame-dropping on slow systems: decodes all video frames, but skips displaying some ones"},
-/*UD*/ {"hardframedrop", &mp_conf.frame_dropping, CONF_TYPE_FLAG, 0, 0, 2, NULL, "enables hard frame-dropping on slow systems: skips displaying and decoding of some frames"},
- {"noframedrop", &mp_conf.frame_dropping, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables frame dropping"},
- {"pts", &mp_conf.av_sync_pts, CONF_TYPE_FLAG, 0, 0, 1, NULL, "use PTS-based method of A/V synchronization"},
- {"nopts", &mp_conf.av_sync_pts, CONF_TYPE_FLAG, 0, 1, 0, NULL, "use BPS-based method of A/V synchronization"},
- {"force_pts_fix", &mp_conf.av_force_pts_fix, CONF_TYPE_FLAG, 0, 0, 1, NULL, "force PTS fixing for \"bad\" files"},
- {"noforce_pts_fix", &mp_conf.av_force_pts_fix, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disable PTS fixing for \"bad\" files"},
- {"force_pts_fix2", &mp_conf.av_force_pts_fix2, CONF_TYPE_FLAG, 0, 0, 1, NULL, "force PTS fixing for \"bad\" files without PTS changing"},
- {"noforce_pts_fix2", &mp_conf.av_force_pts_fix2, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disable PTS fixing for \"bad\" files without PTS changing"},
- {"frame_reorder", &mp_conf.frame_reorder, CONF_TYPE_FLAG, 0, 0, 1, NULL, "recalc PTS of frames as they were added to the buffer"},
- {"noframe_reorder", &mp_conf.frame_reorder, CONF_TYPE_FLAG, 0, 1, 0, NULL, "keep original PTS of each frame"},
- {"softsleep", &mp_conf.softsleep, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables high quality software timers for A/V synchronization"},
+ {"framedrop", &mp_conf.frame_dropping, CONF_TYPE_FLAG, 0, 0, 1, "enables frame-dropping on slow systems: decodes all video frames, but skips displaying some ones"},
+/*UD*/ {"hardframedrop", &mp_conf.frame_dropping, CONF_TYPE_FLAG, 0, 0, 2, "enables hard frame-dropping on slow systems: skips displaying and decoding of some frames"},
+ {"noframedrop", &mp_conf.frame_dropping, CONF_TYPE_FLAG, 0, 1, 0, "disables frame dropping"},
+ {"pts", &mp_conf.av_sync_pts, CONF_TYPE_FLAG, 0, 0, 1, "use PTS-based method of A/V synchronization"},
+ {"nopts", &mp_conf.av_sync_pts, CONF_TYPE_FLAG, 0, 1, 0, "use BPS-based method of A/V synchronization"},
+ {"force_pts_fix", &mp_conf.av_force_pts_fix, CONF_TYPE_FLAG, 0, 0, 1, "force PTS fixing for \"bad\" files"},
+ {"noforce_pts_fix", &mp_conf.av_force_pts_fix, CONF_TYPE_FLAG, 0, 1, 0, "disable PTS fixing for \"bad\" files"},
+ {"force_pts_fix2", &mp_conf.av_force_pts_fix2, CONF_TYPE_FLAG, 0, 0, 1, "force PTS fixing for \"bad\" files without PTS changing"},
+ {"noforce_pts_fix2", &mp_conf.av_force_pts_fix2, CONF_TYPE_FLAG, 0, 1, 0, "disable PTS fixing for \"bad\" files without PTS changing"},
+ {"frame_reorder", &mp_conf.frame_reorder, CONF_TYPE_FLAG, 0, 0, 1, "recalc PTS of frames as they were added to the buffer"},
+ {"noframe_reorder", &mp_conf.frame_reorder, CONF_TYPE_FLAG, 0, 1, 0, "keep original PTS of each frame"},
+ {"softsleep", &mp_conf.softsleep, CONF_TYPE_FLAG, 0, 0, 1, "enables high quality software timers for A/V synchronization"},
#ifdef HAVE_RTC
- {"rtc", &mp_conf.nortc, CONF_TYPE_FLAG, 0, 1, 0, NULL, "enables using of /dev/rtc (real-time clock chip) to compute PTS"},
- {"nortc", &mp_conf.nortc, CONF_TYPE_FLAG, 0, 0, 1, NULL, "disables using of /dev/rtc (real-time clock chip) to compute PTS"},
+ {"rtc", &mp_conf.nortc, CONF_TYPE_FLAG, 0, 1, 0, "enables using of /dev/rtc (real-time clock chip) to compute PTS"},
+ {"nortc", &mp_conf.nortc, CONF_TYPE_FLAG, 0, 0, 1, "disables using of /dev/rtc (real-time clock chip) to compute PTS"},
#endif
- {"fps", &mp_conf.force_fps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, NULL, "forces frame rate (if value is wrong in the header)"},
- {"vsync", &vo_conf.vsync, CONF_TYPE_FLAG, 0, 0, 1, NULL, "forces video hardware to wait VSYNC signal before frame switching"},
- {"novsync", &vo_conf.vsync, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables video hardware to wait VSYNC signal before frame switching"},
- {NULL, NULL, 0, 0, 0, 0, NULL,NULL},
+ {"fps", &mp_conf.force_fps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, "forces frame rate (if value is wrong in the header)"},
+ {"vsync", &vo_conf.vsync, CONF_TYPE_FLAG, 0, 0, 1, "forces video hardware to wait VSYNC signal before frame switching"},
+ {"novsync", &vo_conf.vsync, CONF_TYPE_FLAG, 0, 1, 0, "disables video hardware to wait VSYNC signal before frame switching"},
+ {NULL, NULL, 0, 0, 0, 0, NULL},
};
static const config_t subtitle_config[]={
- {"on", &mp_conf.has_dvdsub, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables subtitle-steam playback"},
- {"off", &mp_conf.has_dvdsub, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables subtitle-stream playback"},
- {"vob", &mp_conf.vobsub_name, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies the VobSub files that are to be used for subtitle"},
- {"vobid", &mp_conf.vobsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL, "specifies the VobSub subtitle id"},
+ {"on", &mp_conf.has_dvdsub, CONF_TYPE_FLAG, 0, 0, 1, "enables subtitle-steam playback"},
+ {"off", &mp_conf.has_dvdsub, CONF_TYPE_FLAG, 0, 1, 0, "disables subtitle-stream playback"},
+ {"vob", &mp_conf.vobsub_name, CONF_TYPE_STRING, 0, 0, 0, "specifies the VobSub files that are to be used for subtitle"},
+ {"vobid", &mp_conf.vobsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, "specifies the VobSub subtitle id"},
#ifdef USE_SUB
- {"file", &mp_conf.sub_name, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies the subtitle file"},
+ {"file", &mp_conf.sub_name, CONF_TYPE_STRING, 0, 0, 0, "specifies the subtitle file"},
#ifdef USE_ICONV
- {"cp", &sub_data.cp, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies codepage of subtitles"},
+ {"cp", &sub_data.cp, CONF_TYPE_STRING, 0, 0, 0, "specifies codepage of subtitles"},
#endif
- {"fps", &mp_conf.sub_fps, CONF_TYPE_FLOAT, 0, 0.0, 10.0, NULL, "specifies frame/sec rate of subtitle file"},
- {"noauto", &mp_conf.sub_auto, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disable autodetection of vobsub for textsubs if vobsub found"},
- {"unicode", &sub_data.unicode, CONF_TYPE_FLAG, 0, 0, 1, NULL, "tells MPlayerXP to handle the subtitle file as UNICODE"},
- {"nounicode", &sub_data.unicode, CONF_TYPE_FLAG, 0, 1, 0, NULL, "tells MPlayerXP to handle the subtitle file as non-UNICODE"},
- {"utf8", &sub_data.utf8, CONF_TYPE_FLAG, 0, 0, 1, NULL, "tells MPlayerXP to handle the subtitle file as UTF8"},
- {"noutf8", &sub_data.utf8, CONF_TYPE_FLAG, 0, 1, 0, NULL, "tells MPlayerXP to handle the subtitle file as non-UTF8"},
- {"pos",&sub_data.pos, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL, "specifies vertical shift of subtitles"},
+ {"fps", &mp_conf.sub_fps, CONF_TYPE_FLOAT, 0, 0.0, 10.0, "specifies frame/sec rate of subtitle file"},
+ {"noauto", &mp_conf.sub_auto, CONF_TYPE_FLAG, 0, 1, 0, "disable autodetection of vobsub for textsubs if vobsub found"},
+ {"unicode", &sub_data.unicode, CONF_TYPE_FLAG, 0, 0, 1, "tells MPlayerXP to handle the subtitle file as UNICODE"},
+ {"nounicode", &sub_data.unicode, CONF_TYPE_FLAG, 0, 1, 0, "tells MPlayerXP to handle the subtitle file as non-UNICODE"},
+ {"utf8", &sub_data.utf8, CONF_TYPE_FLAG, 0, 0, 1, "tells MPlayerXP to handle the subtitle file as UTF8"},
+ {"noutf8", &sub_data.utf8, CONF_TYPE_FLAG, 0, 1, 0, "tells MPlayerXP to handle the subtitle file as non-UTF8"},
+ {"pos",&sub_data.pos, CONF_TYPE_INT, CONF_RANGE, 0, 100, "specifies vertical shift of subtitles"},
#endif
- {"cc", &subcc_enabled, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enable DVD Closed Caption (CC) subtitles"},
- {"nocc", &subcc_enabled, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disable DVD Closed Caption (CC) subtitles"},
- {"id", &mp_conf.dvdsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL, "selects subtitle channel"},
- {"lang", &mp_conf.dvdsub_lang, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies language of DVD-subtitle stream as two-letter country code(s)"},
- {"ifo", &mp_conf.spudec_ifo, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies .ifo file for DVD subtitles"},
- {NULL, NULL, 0, 0, 0, 0, NULL,NULL},
+ {"cc", &subcc_enabled, CONF_TYPE_FLAG, 0, 0, 1, "enable DVD Closed Caption (CC) subtitles"},
+ {"nocc", &subcc_enabled, CONF_TYPE_FLAG, 0, 1, 0, "disable DVD Closed Caption (CC) subtitles"},
+ {"id", &mp_conf.dvdsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, "selects subtitle channel"},
+ {"lang", &mp_conf.dvdsub_lang, CONF_TYPE_STRING, 0, 0, 0, "specifies language of DVD-subtitle stream as two-letter country code(s)"},
+ {"ifo", &mp_conf.spudec_ifo, CONF_TYPE_STRING, 0, 0, 0, "specifies .ifo file for DVD subtitles"},
+ {NULL, NULL, 0, 0, 0, 0, NULL},
};
#ifdef HAVE_X11
static const config_t x11_config[]={
- {"display", &vo_conf.mDisplayName, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies the hostname and display number of the X server"},
- {"wid", &vo_conf.WinID, CONF_TYPE_INT, 0, 0, 0, NULL, "tells MPlayerXP to use existing X11 window (for using MPlayerXP as plugin)"},
- {"rootwin", &vo_conf.WinID, CONF_TYPE_FLAG, 0, -1, 0, NULL, "render movie in the root window (desktop background)"},
+ {"display", &vo_conf.mDisplayName, CONF_TYPE_STRING, 0, 0, 0, "specifies the hostname and display number of the X server"},
+ {"wid", &vo_conf.WinID, CONF_TYPE_INT, 0, 0, 0, "tells MPlayerXP to use existing X11 window (for using MPlayerXP as plugin)"},
+ {"rootwin", &vo_conf.WinID, CONF_TYPE_FLAG, 0, -1, 0, "render movie in the root window (desktop background)"},
#ifdef HAVE_XINERAMA
- {"xinerama", &xinerama_screen, CONF_TYPE_INT, CONF_RANGE, 0, 32, NULL, "tells MPlayerXP the display for movie playback"},
+ {"xinerama", &xinerama_screen, CONF_TYPE_INT, CONF_RANGE, 0, 32, "tells MPlayerXP the display for movie playback"},
#endif
- {NULL, NULL, 0, 0, 0, 0, NULL,NULL},
+ {NULL, NULL, 0, 0, 0, 0, NULL},
};
#endif
static const config_t audio_config[]={
- {"on", &mp_conf.has_audio, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables audio-steam playback"},
- {"off", &mp_conf.has_audio, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables audio-stream playback"},
- {"mixer", &oss_mixer_device, CONF_TYPE_STRING, 0, 0, 0, NULL, "select audio-mixer device"},
- {"channels", &audio_output_channels, CONF_TYPE_INT, CONF_RANGE, 2, 8, NULL, "select number of audio output channels to be used"},
- {"rate", &mp_conf.force_srate, CONF_TYPE_INT, CONF_RANGE, 1000, 8*48000, NULL, "specifies Hz for audio playback"},
- {"lang", &mp_conf.audio_lang, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies language of DVD-audio stream as two-letter country code(s)"},
- {"id", &mp_conf.audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL, "selects audio channel"},
+ {"on", &mp_conf.has_audio, CONF_TYPE_FLAG, 0, 0, 1, "enables audio-steam playback"},
+ {"off", &mp_conf.has_audio, CONF_TYPE_FLAG, 0, 1, 0, "disables audio-stream playback"},
+ {"mixer", &oss_mixer_device, CONF_TYPE_STRING, 0, 0, 0, "select audio-mixer device"},
+ {"channels", &audio_output_channels, CONF_TYPE_INT, CONF_RANGE, 2, 8, "select number of audio output channels to be used"},
+ {"rate", &mp_conf.force_srate, CONF_TYPE_INT, CONF_RANGE, 1000, 8*48000, "specifies Hz for audio playback"},
+ {"lang", &mp_conf.audio_lang, CONF_TYPE_STRING, 0, 0, 0, "specifies language of DVD-audio stream as two-letter country code(s)"},
+ {"id", &mp_conf.audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 255, "selects audio channel"},
#ifdef USE_FAKE_MONO
- {"stereo", &fakemono, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL, "selects type of MP2/MP3 stereo output"},
+ {"stereo", &fakemono, CONF_TYPE_INT, CONF_RANGE, 0, 2, "selects type of MP2/MP3 stereo output"},
#endif
- {NULL, NULL, 0, 0, 0, 0, NULL,NULL},
+ {NULL, NULL, 0, 0, 0, 0, NULL},
};
static const config_t video_config[]={
- {"on", &mp_conf.has_video, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables video-steam playback"},
- {"off", &mp_conf.has_video, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables video-stream playback"},
- {"width", &vo_conf.opt_screen_size_x, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL, "scale output image to width (if driver supports)"},
- {"height", &vo_conf.opt_screen_size_y, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL, "scale output image to height (if driver supports)"},
- {"zoom", &vo_conf.screen_size_xy, CONF_TYPE_FLOAT, CONF_RANGE, 0, 4096, NULL, "scale output image by given factor"},
- {"screenw", &vo_conf.screenwidth, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL, "specifies the horizontal resolution of the screen (if supported)"},
- {"screenh", &vo_conf.screenheight, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL, "specifies the vertical resolution of the screen (if supported)"},
- {"aspect", &vo_conf.movie_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0, NULL, "sets aspect-ratio of movies (autodetect)"},
- {"noaspect", &vo_conf.movie_aspect, CONF_TYPE_FLAG, 0, 0, 0, NULL, "unsets aspect-ratio of movies"},
- {"aspect-ratio", &vo_conf.softzoom, CONF_TYPE_FLAG, 0, 0, 1, NULL, "keeps aspect-ratio of the movie during window resize"},
- {"noaspect-ratio", &vo_conf.softzoom, CONF_TYPE_FLAG, 0, 1, 0, NULL, "render movie to the user-defined window's geometry"},
- {"monitorpixelaspect", &monitor_pixel_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 9.0, NULL, "sets the aspect-ratio of a single pixel of TV screen"},
- {"vm", &vo_conf.vidmode, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables video-mode changing during playback"},
- {"novm", &vo_conf.vidmode, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables video-mode changing during playback"},
- {"fs", &vo_conf.fullscreen, CONF_TYPE_FLAG, 0, 0, 1, NULL, "fullscreen playback"},
- {"nofs", &vo_conf.fullscreen, CONF_TYPE_FLAG, 0, 1, 0, NULL, "windowed playback"},
- {"fsmode", &vo_conf.fsmode, CONF_TYPE_INT, CONF_RANGE, 0, 15, NULL, "enables workaround for some fullscreen related problems"},
- {"flip", &vo_conf.flip, CONF_TYPE_FLAG, 0, -1, 1, NULL, "flip output image upside-down"},
- {"noflip", &vo_conf.flip, CONF_TYPE_FLAG, 0, -1, 0, NULL, "render output image as is"},
- {"bpp", &vo_conf.dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32, NULL, "use different color depth than autodetect"},
- {"bm", &vo_conf.use_bm, CONF_TYPE_FLAG, 0, 0, 1, NULL, "enables using of bus-mastering (if it available for given OS/videocard)"},
- {"bm2", &vo_conf.use_bm, CONF_TYPE_FLAG, 0, 0, 2, NULL, "enables using of bus-mastering to store all decoded-ahead frames in video-memory"},
- {"nobm", &vo_conf.use_bm, CONF_TYPE_FLAG, 0, 1, 0, NULL, "disables using of bus-mastering"},
- {"id", &mp_conf.video_id, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL, "selects video channel"},
- {"pp", &npp_options, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies options of post-processing"},
- {"sws", &sws_flags, CONF_TYPE_INT, 0, 0, 2, NULL, "specifies the quality of the software scaler"},
+ {"on", &mp_conf.has_video, CONF_TYPE_FLAG, 0, 0, 1, "enables video-steam playback"},
+ {"off", &mp_conf.has_video, CONF_TYPE_FLAG, 0, 1, 0, "disables video-stream playback"},
+ {"width", &vo_conf.opt_screen_size_x, CONF_TYPE_INT, CONF_RANGE, 0, 4096, "scale output image to width (if driver supports)"},
+ {"height", &vo_conf.opt_screen_size_y, CONF_TYPE_INT, CONF_RANGE, 0, 4096, "scale output image to height (if driver supports)"},
+ {"zoom", &vo_conf.screen_size_xy, CONF_TYPE_FLOAT, CONF_RANGE, 0, 4096, "scale output image by given factor"},
+ {"screenw", &vo_conf.screenwidth, CONF_TYPE_INT, CONF_RANGE, 0, 4096, "specifies the horizontal resolution of the screen (if supported)"},
+ {"screenh", &vo_conf.screenheight, CONF_TYPE_INT, CONF_RANGE, 0, 4096, "specifies the vertical resolution of the screen (if supported)"},
+ {"aspect", &vo_conf.movie_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0, "sets aspect-ratio of movies (autodetect)"},
+ {"noaspect", &vo_conf.movie_aspect, CONF_TYPE_FLAG, 0, 0, 0, "unsets aspect-ratio of movies"},
+ {"aspect-ratio", &vo_conf.softzoom, CONF_TYPE_FLAG, 0, 0, 1, "keeps aspect-ratio of the movie during window resize"},
+ {"noaspect-ratio", &vo_conf.softzoom, CONF_TYPE_FLAG, 0, 1, 0, "render movie to the user-defined window's geometry"},
+ {"monitorpixelaspect", &monitor_pixel_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 9.0, "sets the aspect-ratio of a single pixel of TV screen"},
+ {"vm", &vo_conf.vidmode, CONF_TYPE_FLAG, 0, 0, 1, "enables video-mode changing during playback"},
+ {"novm", &vo_conf.vidmode, CONF_TYPE_FLAG, 0, 1, 0, "disables video-mode changing during playback"},
+ {"fs", &vo_conf.fullscreen, CONF_TYPE_FLAG, 0, 0, 1, "fullscreen playback"},
+ {"nofs", &vo_conf.fullscreen, CONF_TYPE_FLAG, 0, 1, 0, "windowed playback"},
+ {"fsmode", &vo_conf.fsmode, CONF_TYPE_INT, CONF_RANGE, 0, 15, "enables workaround for some fullscreen related problems"},
+ {"flip", &vo_conf.flip, CONF_TYPE_FLAG, 0, -1, 1, "flip output image upside-down"},
+ {"noflip", &vo_conf.flip, CONF_TYPE_FLAG, 0, -1, 0, "render output image as is"},
+ {"bpp", &vo_conf.dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32, "use different color depth than autodetect"},
+ {"bm", &vo_conf.use_bm, CONF_TYPE_FLAG, 0, 0, 1, "enables using of bus-mastering (if it available for given OS/videocard)"},
+ {"bm2", &vo_conf.use_bm, CONF_TYPE_FLAG, 0, 0, 2, "enables using of bus-mastering to store all decoded-ahead frames in video-memory"},
+ {"nobm", &vo_conf.use_bm, CONF_TYPE_FLAG, 0, 1, 0, "disables using of bus-mastering"},
+ {"id", &mp_conf.video_id, CONF_TYPE_INT, CONF_RANGE, 0, 255, "selects video channel"},
+ {"pp", &npp_options, CONF_TYPE_STRING, 0, 0, 0, "specifies options of post-processing"},
+ {"sws", &sws_flags, CONF_TYPE_INT, 0, 0, 2, "specifies the quality of the software scaler"},
#ifdef HAVE_PNG
- {"z", &z_compression, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL, "specifies compression level for PNG output"},
+ {"z", &z_compression, CONF_TYPE_INT, CONF_RANGE, 0, 9, "specifies compression level for PNG output"},
#endif
#ifdef HAVE_SDL
- {"noxv", &sdl_noxv, CONF_TYPE_FLAG, 0, 0, 1, NULL, "disable XVideo hardware acceleration for SDL"},
- {"forcexv", &sdl_forcexv, CONF_TYPE_FLAG, 0, 0, 1, NULL, "force XVideo hardware acceleration for SDL"},
- {"forcegl", &sdl_forcegl, CONF_TYPE_FLAG, 0, 0, 1, NULL, "force OpenGL hardware acceleration for SDL"},
+ {"noxv", &sdl_noxv, CONF_TYPE_FLAG, 0, 0, 1, "disable XVideo hardware acceleration for SDL"},
+ {"forcexv", &sdl_forcexv, CONF_TYPE_FLAG, 0, 0, 1, "force XVideo hardware acceleration for SDL"},
+ {"forcegl", &sdl_forcegl, CONF_TYPE_FLAG, 0, 0, 1, "force OpenGL hardware acceleration for SDL"},
#endif
- {"eq",&veq_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL, "Video-equalizer specific options"},
- {NULL, NULL, 0, 0, 0, 0, NULL,NULL},
+ {"eq",&veq_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "Video-equalizer specific options"},
+ {NULL, NULL, 0, 0, 0, 0, NULL},
};
static const config_t playback_config[]={
- {"sb", &mp_conf.seek_to_byte, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL, "seek to given byte position before playback"},
- {"ss", &mp_conf.seek_to_sec, CONF_TYPE_STRING, CONF_MIN, 0, 0, NULL, "seek to given time position before playback"},
- {"loop", &mp_conf.loop_times, CONF_TYPE_INT, CONF_RANGE, -1, 10000, NULL, "loops movie playback given number of times. 0 means forever"},
- {"noloop", &mp_conf.loop_times, CONF_TYPE_FLAG, 0, 0, -1, NULL, "disable loop of playback"},
- {"shuffle",&mp_conf.shuffle_playback, CONF_TYPE_FLAG, 0, 0, 1, NULL, "play files in random order"},
- {"noshuffle",&mp_conf.shuffle_playback, CONF_TYPE_FLAG, 0, 1, 0, NULL, "play files in regular order"},
- {"list", NULL, CONF_TYPE_STRING, 0, 0, 0, NULL, "specifies playlist (1 file/row or Winamp or ASX format)"},
- {"frames", &mp_conf.play_n_frames, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL, "play given number of frames and exit"},
- {NULL, NULL, 0, 0, 0, 0, NULL,NULL},
+ {"sb", &mp_conf.seek_to_byte, CONF_TYPE_INT, CONF_MIN, 0, 0, "seek to given byte position before playback"},
+ {"ss", &mp_conf.seek_to_sec, CONF_TYPE_STRING, CONF_MIN, 0, 0, "seek to given time position before playback"},
+ {"loop", &mp_conf.loop_times, CONF_TYPE_INT, CONF_RANGE, -1, 10000, "loops movie playback given number of times. 0 means forever"},
+ {"noloop", &mp_conf.loop_times, CONF_TYPE_FLAG, 0, 0, -1, "disable loop of playback"},
+ {"shuffle",&mp_conf.shuffle_playback, CONF_TYPE_FLAG, 0, 0, 1, "play files in random order"},
+ {"noshuffle",&mp_conf.shuffle_playback, CONF_TYPE_FLAG, 0, 1, 0, "play files in regular order"},
+ {"list", NULL, CONF_TYPE_STRING, 0, 0, 0, "specifies playlist (1 file/row or Winamp or ASX format)"},
+ {"frames", &mp_conf.play_n_frames, CONF_TYPE_INT, CONF_MIN, 0, 0, "play given number of frames and exit"},
+ {NULL, NULL, 0, 0, 0, 0, NULL},
};
static const config_t mplayer_opts[]={
/* name, pointer, type, flags, min, max, help */
- {"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL, ""}, /* this don't need anymore to be the first!!! */
+ {"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, ""}, /* this don't need anymore to be the first!!! */
//---------------------- libao/libvo/mplayer options ------------------------
- {"vo", &mp_conf.video_driver, CONF_TYPE_STRING, 0, 0, 0, NULL, "select video output driver and optinaly device"},
- {"ao", &mp_conf.audio_driver, CONF_TYPE_STRING, 0, 0, 0, NULL, "select audio output driver and optinaly device"},
- {"af", &af_cfg.list, CONF_TYPE_STRING, 0, 0, 0, NULL, "selects audio filter"},
- {"vf", &vf_cfg.list, CONF_TYPE_STRING, 0, 0, 0, NULL, "selects video filter"},
- {"afm", &mp_conf.audio_family, CONF_TYPE_STRING, 0, 0, 0, NULL, "forces usage of specified audio-decoders family"},
- {"vfm", &mp_conf.video_family, CONF_TYPE_STRING, 0, 0, 0, NULL, "forces usage of specified video-decoders family"},
- {"ac", &mp_conf.audio_codec, CONF_TYPE_STRING, 0, 0, 0, NULL, "forces usage of specified audio-decoder"},
- {"vc", &mp_conf.video_codec, CONF_TYPE_STRING, 0, 0, 0, NULL, "forces usage of specified video-decoder"},
-/*UD*/ {"verbose", &mp_conf.verbose, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 100, NULL, "verbose output"},
- {"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOSAVE, 0, 0, NULL, "verbose output (more -v means more verbosity)"},
- {"slave", &mp_conf.slave_mode, CONF_TYPE_FLAG,CONF_GLOBAL , 0, 1, NULL, "turns MPlayerXP into slave mode as a backend for other programs"},
- {"use-stdin", &mp_conf.use_stdin, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL, "forces reading of keyboard codes from STDIN instead of terminal's console"},
- {"msgfilter", &mp_msg_filter, CONF_TYPE_INT, CONF_RANGE, 0, 0xFFFFFFFF, NULL, "specifies filter for verbosed messages"},
+ {"vo", &mp_conf.video_driver, CONF_TYPE_STRING, 0, 0, 0, "select video output driver and optinaly device"},
+ {"ao", &mp_conf.audio_driver, CONF_TYPE_STRING, 0, 0, 0, "select audio output driver and optinaly device"},
+ {"af", &af_cfg.list, CONF_TYPE_STRING, 0, 0, 0, "selects audio filter"},
+ {"vf", &vf_cfg.list, CONF_TYPE_STRING, 0, 0, 0, "selects video filter"},
+ {"afm", &mp_conf.audio_family, CONF_TYPE_STRING, 0, 0, 0, "forces usage of specified audio-decoders family"},
+ {"vfm", &mp_conf.video_family, CONF_TYPE_STRING, 0, 0, 0, "forces usage of specified video-decoders family"},
+ {"ac", &mp_conf.audio_codec, CONF_TYPE_STRING, 0, 0, 0, "forces usage of specified audio-decoder"},
+ {"vc", &mp_conf.video_codec, CONF_TYPE_STRING, 0, 0, 0, "forces usage of specified video-decoder"},
+/*UD*/ {"verbose", &mp_conf.verbose, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 100, "verbose output"},
+ {"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOSAVE, 0, 0, "verbose output (more -v means more verbosity)"},
+ {"slave", &mp_conf.slave_mode, CONF_TYPE_FLAG,CONF_GLOBAL , 0, 1, "turns MPlayerXP into slave mode as a backend for other programs"},
+ {"use-stdin", &mp_conf.use_stdin, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, "forces reading of keyboard codes from STDIN instead of terminal's console"},
+ {"msgfilter", &mp_msg_filter, CONF_TYPE_INT, CONF_RANGE, 0, 0xFFFFFFFF, "specifies filter for verbosed messages"},
- {"core", &xpcore_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL, "XP-core related options" },
- {"play", &playback_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL, "Playback specific options" },
- {"audio", &audio_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL, "Audio related options" },
- {"video", &video_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL, "Video related options" },
- {"sub", &subtitle_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL, "Subtitle related options" },
+ {"core", &xpcore_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "XP-core related options" },
+ {"play", &playback_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "Playback specific options" },
+ {"audio", &audio_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "Audio related options" },
+ {"video", &video_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "Video related options" },
+ {"sub", &subtitle_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "Subtitle related options" },
#ifdef HAVE_X11
- {"x", &x11_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL, "X11-specific options" },
+ {"x", &x11_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "X11-specific options" },
#endif
- {"osd", &osd_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL, "OSD-related options"},
- {"sync", &avsync_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL, "AV-synchronization related options" },
+ {"osd", &osd_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "OSD-related options"},
+ {"sync", &avsync_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "AV-synchronization related options" },
#if defined( ARCH_X86 ) || defined(ARCH_X86_64)
- {"cpu", &cpu_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL, "CPU specific options" },
+ {"cpu", &cpu_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "CPU specific options" },
#endif
// ------------------------- stream options --------------------
#ifdef HAVE_STREAMING
- { "net", &net_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL, "Network specific options" },
+ { "net", &net_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, "Network specific options" },
#endif
// ------------------------- codec/pp options --------------------
- {NULL, NULL, 0, 0, 0, 0, NULL, NULL}
+ {NULL, NULL, 0, 0, 0, 0, NULL}
};
Modified: mplayerxp/input/input.c
===================================================================
--- mplayerxp/input/input.c 2012-10-30 09:09:49 UTC (rev 258)
+++ mplayerxp/input/input.c 2012-10-30 13:43:23 UTC (rev 259)
@@ -398,39 +398,39 @@
static const char* in_file = NULL;
static int in_file_fd = -1;
-static int mp_input_print_key_list(config_t* cfg);
-static int mp_input_print_cmd_list(config_t* cfg);
+static int mp_input_print_key_list(const config_t* cfg);
+static int mp_input_print_cmd_list(const config_t* cfg);
static const config_t joystick_conf[] = {
- { "on", &use_joystick, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL, "enables using of joystick" },
- { "off", &use_joystick, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL, "disables using of joystick" },
- { "dev", &js_dev, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL, "specifies the joystick device" },
- { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
+ { "on", &use_joystick, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, "enables using of joystick" },
+ { "off", &use_joystick, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, "disables using of joystick" },
+ { "dev", &js_dev, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, "specifies the joystick device" },
+ { NULL, NULL, 0, 0, 0, 0, NULL}
};
extern char *lirc_configfile;
// Our command line options
static const config_t input_conf[] = {
- { "conf", &config_file, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL, "specifies alternative input.conf" },
- { "ar-delay", &ar_delay, CONF_TYPE_INT, CONF_GLOBAL, 0, 0, NULL, "autorepeate a key delay in milliseconds (0 to disable)" },
- { "ar-rate", &ar_rate, CONF_TYPE_INT, CONF_GLOBAL, 0, 0, NULL, "number of key-presses per second generating on autorepeat" },
- { "keylist", mp_input_print_key_list, CONF_TYPE_FUNC, CONF_GLOBAL, 0, 0, NULL, "prints all keys that can be bound to commands" },
- { "cmdlist", mp_input_print_cmd_list, CONF_TYPE_FUNC, CONF_GLOBAL, 0, 0, NULL, "prints all commands that can be bound to keys" },
- { "file", &in_file, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL, "specifes file with commands (useful for FIFO)" },
+ { "conf", &config_file, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, "specifies alternative input.conf" },
+ { "ar-delay", &ar_delay, CONF_TYPE_INT, CONF_GLOBAL, 0, 0, "autorepeate a key delay in milliseconds (0 to disable)" },
+ { "ar-rate", &ar_rate, CONF_TYPE_INT, CONF_GLOBAL, 0, 0, "number of key-presses per second generating on autorepeat" },
+ { "keylist", mp_input_print_key_list, CONF_TYPE_FUNC, CONF_GLOBAL, 0, 0, "prints all keys that can be bound to commands" },
+ { "cmdlist", mp_input_print_cmd_list, CONF_TYPE_FUNC, CONF_GLOBAL, 0, 0, "prints all commands that can be bound to keys" },
+ { "file", &in_file, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, "specifes file with commands (useful for FIFO)" },
#ifdef HAVE_LIRC
- { "lircconf", &lirc_configfile, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL, "specifies a config.file for LIRC"},
+ { "lircconf", &lirc_configfile, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, "specifies a config.file for LIRC"},
#endif
- { "lirc", &use_lirc, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL, "enables using of lirc" },
- { "nolirc", &use_lirc, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL, "disables using of lirc" },
- { "lircc", &use_lircc, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL, "enables using of lirc daemon" },
- { "nolircc", &use_lircc, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL, "disables using of lirc daemon" },
- { "joystick", &joystick_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL, "Joystick related options" },
- { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
+ { "lirc", &use_lirc, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, "enables using of lirc" },
+ { "nolirc", &use_lirc, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, "disables using of lirc" },
+ { "lircc", &use_lircc, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, "enables using of lirc daemon" },
+ { "nolircc", &use_lircc, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, "disables using of lirc daemon" },
+ { "joystick", &joystick_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, "Joystick related options" },
+ { NULL, NULL, 0, 0, 0, 0, NULL}
};
static const config_t mp_input_opts[] = {
- { "input", &input_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL, "Input specific options"},
- { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
+ { "input", &input_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, "Input specific options"},
+ { NULL, NULL, 0, 0, 0, 0, NULL}
};
static int mp_input_default_key_func(int fd);
@@ -441,7 +441,7 @@
int
-mp_input_add_cmd_fd(int fd, int select, mp_cmd_func_t read_func, mp_close_func_t close_func) {
+mp_input_add_cmd_fd(int fd, int sel, mp_cmd_func_t read_func, mp_close_func_t close_func) {
if(num_cmd_fd == MP_MAX_CMD_FD) {
MSG_ERR("Too much command fd, unable to register fd %d\n",fd);
return 0;
@@ -451,7 +451,7 @@
cmd_fds[num_cmd_fd].fd = fd;
cmd_fds[num_cmd_fd].read_func = read_func ? read_func : mp_input_default_cmd_func;
cmd_fds[num_cmd_fd].close_func = close_func;
- if(!select)
+ if(!sel)
cmd_fds[num_cmd_fd].flags = MP_FD_NO_SELECT;
num_cmd_fd++;
@@ -497,7 +497,7 @@
}
int
-mp_input_add_key_fd(int fd, int select, mp_key_func_t read_func, mp_close_func_t close_func) {
+mp_input_add_key_fd(int fd, int sel, mp_key_func_t read_func, mp_close_func_t close_func) {
if(num_key_fd == MP_MAX_KEY_FD) {
MSG_ERR("Too much key fd, unable to register fd %d\n",fd);
return 0;
@@ -507,7 +507,7 @@
key_fds[num_key_fd].fd = fd;
key_fds[num_key_fd].read_func = read_func ? read_func : mp_input_default_key_func;
key_fds[num_key_fd].close_func = close_func;
- if(!select)
+ if(!sel)
key_fds[num_key_fd].flags |= MP_FD_NO_SELECT;
num_key_fd++;
@@ -826,7 +826,7 @@
}
int
-mp_input_read_key_code(int time) {
+mp_input_read_key_code(int tim) {
#ifndef HAVE_NO_POSIX_SELECT
fd_set fds;
struct timeval tv,*time_val;
@@ -864,9 +864,9 @@
// if we have fd's without MP_FD_NO_SELECT flag, call select():
if(n>0){
- if(time >= 0 ) {
- tv.tv_sec=time/1000;
- tv.tv_usec = (time%1000)*1000;
+ if(tim >= 0 ) {
+ tv.tv_sec=tim/1000;
+ tv.tv_usec = (tim%1000)*1000;
time_val = &tv;
} else
time_val = NULL;
@@ -898,7 +898,7 @@
continue;
#endif
if(key_fds[i].fd == 0) { // stdin is handled by getch2
- code = getch2(time);
+ code = getch2(tim);
if(code < 0)
code = MP_INPUT_NOTHING;
}
@@ -919,8 +919,8 @@
}
static mp_cmd_t*
-mp_input_read_keys(int time,int paused) {
- int code = mp_input_read_key_code(time);
+mp_input_read_keys(int tim,int paused) {
+ int code = mp_input_read_key_code(tim);
unsigned int j;
mp_cmd_t* ret;
@@ -1010,7 +1010,7 @@
}
static mp_cmd_t*
-mp_input_read_cmds(int time) {
+mp_input_read_cmds(int tim) {
#ifndef HAVE_NO_POSIX_SELECT
fd_set fds;
struct timeval tv,*time_val;
@@ -1046,9 +1046,9 @@
return NULL;
#ifndef HAVE_NO_POSIX_SELECT
- if(time >= 0) {
- tv.tv_sec=time/1000;
- tv.tv_usec = (time%1000)*1000;
+ if(tim >= 0) {
+ tv.tv_sec=tim/1000;
+ tv.tv_usec = (tim%1000)*1000;
time_val = &tv;
} else
time_val = NULL;
@@ -1133,7 +1133,7 @@
* Do not mp_free the returned cmd whe you set this!
*/
mp_cmd_t*
-mp_input_get_cmd(int time, int paused, int peek_only) {
+mp_input_get_cmd(int tim, int paused, int peek_only) {
mp_cmd_t* ret = NULL;
mp_cmd_filter_t* cf;
int from_queue;
@@ -1143,9 +1143,9 @@
ret = mp_input_get_queued_cmd(peek_only);
if(ret) break;
from_queue = 0;
- ret = mp_input_read_keys(time,paused);
+ ret = mp_input_read_keys(tim,paused);
if(ret) break;
- ret = mp_input_read_cmds(time);
+ ret = mp_input_read_cmds(tim);
break;
}
if(!ret) return NULL;
@@ -1268,7 +1268,7 @@
void
mp_input_bind_keys(int keys[MP_MAX_KEY_DOWN+1], char* cmd) {
int i = 0,j;
- mp_cmd_bind_t* bind = NULL;
+ mp_cmd_bind_t* _bind = NULL;
#ifdef MP_DEBUG
assert(keys != NULL);
@@ -1280,21 +1280,21 @@
for(j = 0 ; cmd_binds[i].input[j] == keys[j] && keys[j] != 0 ; j++)
/* NOTHING */;
if(keys[j] == 0 && cmd_binds[i].input[j] == 0 ) {
- bind = &cmd_binds[i];
+ _bind = &cmd_binds[i];
break;
}
}
}
- if(!bind) {
+ if(!_bind) {
cmd_binds = (mp_cmd_bind_t*)mp_realloc(cmd_binds,(i+2)*sizeof(mp_cmd_bind_t));
memset(&cmd_binds[i],0,2*sizeof(mp_cmd_bind_t));
- bind = &cmd_binds[i];
+ _bind = &cmd_binds[i];
}
- if(bind->cmd)
- mp_free(bind->cmd);
- bind->cmd = mp_strdup(cmd);
- memcpy(bind->input,keys,(MP_MAX_KEY_DOWN+1)*sizeof(int));
+ if(_bind->cmd)
+ mp_free(_bind->cmd);
+ _bind->cmd = mp_strdup(cmd);
+ memcpy(_bind->input,keys,(MP_MAX_KEY_DOWN+1)*sizeof(int));
}
@@ -1559,7 +1559,7 @@
MSG_INFO("%s\n",key_names[i].name);
}
-static int mp_input_print_key_list(config_t* cfg) {
+static int mp_input_print_key_list(const config_t* cfg) {
mp_input_print_keys();
exit(0);
}
@@ -1606,15 +1606,15 @@
}
}
-static int mp_input_print_cmd_list(config_t* cfg) {
+static int mp_input_print_cmd_list(const config_t* cfg) {
mp_input_print_cmds();
exit(0);
}
int
-mp_input_check_interrupt(int time) {
+mp_input_check_interrupt(int tim) {
mp_cmd_t* cmd;
- if((cmd = mp_input_get_cmd(time,0,1)) == NULL)
+ if((cmd = mp_input_get_cmd(tim,0,1)) == NULL)
return 0;
switch(cmd->id) {
case MP_CMD_QUIT:
@@ -1626,7 +1626,7 @@
return 1;
}
// remove the cmd from the queue
- cmd = mp_input_get_cmd(time,0,0);
+ cmd = mp_input_get_cmd(tim,0,0);
mp_cmd_free(cmd);
return 0;
}
Modified: mplayerxp/libao2/ao_alsa9.c
===================================================================
--- mplayerxp/libao2/ao_alsa9.c 2012-10-30 09:09:49 UTC (rev 258)
+++ mplayerxp/libao2/ao_alsa9.c 2012-10-30 13:43:23 UTC (rev 259)
@@ -54,7 +54,7 @@
int noblock;
}priv_conf_t;
static priv_conf_t priv_conf;
-static mrl_config_t alsaconf[]={
+static const mrl_config_t alsaconf[]={
{ "mmap", &priv_conf.mmap, MRL_TYPE_BOOL, 0, 1 },
{ "noblock", &priv_conf.noblock, MRL_TYPE_BOOL, 0, 1 },
{ NULL, NULL, 0, 0, 0 }
Modified: mplayerxp/libmpcodecs/ad_a52.c
===================================================================
--- mplayerxp/libmpcodecs/ad_a52.c 2012-10-30 09:09:49 UTC (rev 258)
+++ mplayerxp/libmpcodecs/ad_a52.c 2012-10-30 13:43:23 UTC (rev 259)
@@ -37,7 +37,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL}
};
LIBAD_EXTERN(a52)
Modified: mplayerxp/libmpcodecs/ad_acm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_acm.c 2012-10-30 09:09:49 UTC (rev 258)
+++ mplayerxp/libmpcodecs/ad_acm.c 2012-10-30 13:43:23 UTC (rev 259)
@@ -20,7 +20,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL}
};
LIBAD_EXTERN(msacm)
Modified: mplayerxp/libmpcodecs/ad_dca.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dca.c 2012-10-30 09:09:49 UTC (rev 258)
+++ mplayerxp/libmpcodecs/ad_dca.c 2012-10-30 13:43:23 UTC (rev 259)
@@ -41,7 +41,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL}
};
LIBAD_EXTERN(dca)
Modified: mplayerxp/libmpcodecs/ad_dmo.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dmo.c 2012-10-30 09:09:49 UTC (rev 258)
+++ mplayerxp/libmpcodecs/ad_dmo.c 2012-10-30 13:43:23 UTC (rev 259)
@@ -20,7 +20,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL}
};
LIBAD_EXTERN(dmo)
Modified: mplayerxp/libmpcodecs/ad_dshow.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dshow.c 2012-10-30 09:09:49 UTC (rev 258)
+++ mplayerxp/libmpcodecs/ad_dshow.c 2012-10-30 13:43:23 UTC (rev 259)
@@ -18,7 +18,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL}
};
LIBAD_EXTERN(dshow)
Modified: mplayerxp/libmpcodecs/ad_dvdpcm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dvdpcm.c 2012-10-30 09:09:49 UTC (rev 258)
+++ mplayerxp/libmpcodecs/ad_dvdpcm.c 2012-10-30 13:43:23 UTC (rev 259)
@@ -14,7 +14,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL}
};
LIBAD_EXTERN(dvdpcm)
Modified: mplayerxp/libmpcodecs/ad_faad.c
===================================================================
--- mplayerxp/libmpcodecs/ad_faad.c 2012-10-30 09:09:49 UTC (rev 258)
+++ mplayerxp/libmpcodecs/ad_faad.c 2012-10-30 13:43:23 UTC (rev 259)
@@ -32,7 +32,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL}
};
LIBAD_EXTERN(faad)
Modified: mplayerxp/libmpcodecs/ad_ffmp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_ffmp3.c 2012-10-30 09:09:49 UTC (rev 258)
+++ mplayerxp/libmpcodecs/ad_ffmp3.c 2012-10-30 13:43:23 UTC (rev 259)
@@ -32,7 +32,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL}
};
LIBAD_EXTERN(ffmp3)
Modified: mplayerxp/libmpcodecs/ad_hwac3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_hwac3.c 2012-10-30 09:09:49 UTC (rev 258)
+++ mplayerxp/libmpcodecs/ad_hwac3.c 2012-10-30 13:43:23 UTC (rev 259)
@@ -150,7 +150,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL}
};
LIBAD_EXTERN(hwac3)
Modified: mplayerxp/libmpcodecs/ad_libdv.c
===================================================================
--- mplayerxp/libmpcodecs/ad_libdv.c 2012-10-30 09:09:49 UTC (rev 258)
+++ mplayerxp/libmpcodecs/ad_libdv.c 2012-10-30 13:43:23 UTC (rev 259)
@@ -27,7 +27,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL}
};
LIBAD_EXTERN(libdv)
Modified: mplayerxp/libmpcodecs/ad_mp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_mp3.c 2012-10-30 09:09:49 UTC (rev 258)
+++ mplayerxp/libmpcodecs/ad_mp3.c 2012-10-30 13:43:23 UTC (rev 259)
@@ -23,7 +23,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL}
};
LIBAD_EXTERN(mp3)
Modified: mplayerxp/libmpcodecs/ad_null.c
===================================================================
--- mplayerxp/libmpcodecs/ad_null.c 2012-10-30 09:09:49 UTC (rev 258)
+++ mplayerxp/libmpcodecs/ad_null.c 2012-10-30 13:43:23 UTC (rev 259)
@@ -12,7 +12,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL}
};
LIBAD_EXTERN(null)
Modified: mplayerxp/libmpcodecs/ad_pcm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_pcm.c 2012-10-30 09:09:49 UTC (rev 258)
+++ mplayerxp/libmpcodecs/ad_pcm.c 2012-10-30 13:43:23 UTC (rev 259)
@@ -13,7 +13,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL}
};
LIBAD_EXTERN(pcm)
Modified: mplayerxp/libmpcodecs/ad_qtaudio.c
===================================================================
--- mplayerxp/libmpcodecs/ad_qtaudio.c 2012-10-30 09:09:49 UTC (rev 258)
+++ mplayerxp/libmpcodecs/ad_qtaudio.c 2012-10-30 13:43:23 UTC (rev 259)
@@ -25,7 +25,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL}
};
LIBAD_EXTERN(qtaudio)
Modified: mplayerxp/libmpcodecs/ad_real.c
===================================================================
--- mplayerxp/libmpcodecs/ad_real.c 2012-10-30 09:09:49 UTC (rev 258)
+++ mplayerxp/libmpcodecs/ad_real.c 2012-10-30 13:43:23 UTC (rev 259)
@@ -20,7 +20,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL}
};
LIBAD_EXTERN(real)
Modified: mplayerxp/libmpcodecs/ad_twin.c
===================================================================
--- mplayerxp/libmpcodecs/ad_twin.c 2012-10-30 09:09:49 UTC (rev 258)
+++ mplayerxp/libmpcodecs/ad_twin.c 2012-10-30 13:43:23 UTC (rev 259)
@@ -22,7 +22,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL}
};
LIBAD_EXTERN(twin)
Modified: mplayerxp/libmpcodecs/ad_vorbis.c
===================================================================
--- mplayerxp/libmpcodecs/ad_vorbis.c 2012-10-30 09:09:49 UTC (rev 258)
+++ mplayerxp/libmpcodecs/ad_vorbis.c 2012-10-30 13:43:23 UTC (rev 259)
@@ -20,7 +20,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL}
};
LIBAD_EXTERN(vorbis)
Modified: mplayerxp/libmpcodecs/vd_divx4.c
===================================================================
--- mplayerxp/libmpcodecs/vd_divx4.c 2012-10-30 09:09:49 UTC (rev 258)
+++ mplayerxp/libmpcodecs/vd_divx4.c 2012-10-30 13:43:23 UTC (rev 259)
@@ -30,7 +30,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL}
};
LIBVD_EXTERN(divx4)
Modified: mplayerxp/libmpcodecs/vd_dmo.c
===================================================================
--- mplayerxp/libmpcodecs/vd_dmo.c 2012-10-30 09:09:49 UTC (rev 258)
+++ mplayerxp/libmpcodecs/vd_dmo.c 2012-10-30 13:43:23 UTC (rev 259)
@@ -22,7 +22,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL}
};
LIBVD_EXTERN(dmo)
Modified: mplayerxp/libmpcodecs/vd_dshow.c
===================================================================
--- mplayerxp/libmpcodecs/vd_dshow.c 2012-10-30 09:09:49 UTC (rev 258)
+++ mplayerxp/libmpcodecs/vd_dshow.c 2012-10-30 13:43:23 UTC (rev 259)
@@ -20,7 +20,7 @@
};
static const config_t options[] = {
- { NULL, NULL, 0, 0, 0, 0, NULL, NULL}
+ { NULL, NULL, 0, 0, 0, 0, NULL}
};
LIBVD_EXTERN(dshow)
Modified: mplayerxp/libmpcodecs/vd_ffmpeg.c
=====...
[truncated message content] |
