1
0
mirror of https://github.com/mpv-player/mpv synced 2025-01-12 01:49:33 +00:00
Commit Graph

253 Commits

Author SHA1 Message Date
Uoti Urpala
0301309425 Merge svn changes up to 27824
Conflicts:
	cfg-common-opts.h
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libvo/x11_common.h
	mplayer.c
	stream/cache2.c
2008-10-25 05:12:34 +03:00
diego
4d644f513c Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
This avoids a pointless indirection that only obscures what is really done.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27761 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-13 16:23:55 +00:00
diego
785e8bca87 Remove redundant declaration of proc_priority.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27750 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-12 22:11:33 +00:00
Uoti Urpala
e09fe1ce04 Merge svn changes up to r27458 2008-08-12 15:03:34 +03:00
diego
f88bf0c7b7 Remove pointless #ifdefs around extern declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27458 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-12 07:38:30 +00:00
diego
51700fd1f5 Remove useless DVB-related #include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27457 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-12 07:33:15 +00:00
Uoti Urpala
17d3e4b36d Merge svn changes up to r27441
Conflicts:

	cfg-common-opts.h
	command.c
	configure
	input/input.c
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpdemux/stheader.h
	libvo/sub.c
	libvo/video_out.c
	libvo/vo_xv.c
	libvo/vosub_vidix.c
	libvo/x11_common.c
	libvo/x11_common.h
	mp_core.h
	mplayer.c
	stream/stream.h
2008-08-08 02:13:09 +03:00
diego
024b6efdf1 Introduce CONFIG_ALSA preprocessor directive for ALSA 0.9 and 1.x.
Use it in all the places that checked for either ALSA 0.9 or 1.x.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27422 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-06 23:19:29 +00:00
diego
f83e779ee4 Rename some audio-output-related preprocessor directives.
Switch them from a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27419 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-05 16:32:47 +00:00
diego
02135001b4 Change a bunch of video/audio-output-specific preprocessor directives from
a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-03 15:21:40 +00:00
Uoti Urpala
04f3909a72 Merge svn changes up to r27374
Conflicts:

	cfg-common-opts.h
	cfg-mplayer.h
	command.c
	configure
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpcodecs/vf_vo.c
	libmpdemux/demuxer.h
	libmpdemux/stheader.h
	mp_core.h
	mplayer.c
	stream/stream_radio.c
2008-07-30 16:39:24 +03:00
diego
4b141479da Start unifying names of internal preprocessor directives.
Replace all USE_ prefixes by CONFIG_ prefixes to indicate
options which are configurable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-30 12:01:30 +00:00
Uoti Urpala
de560e8167 Merge svn changes up to r27123
Conflicts:

	libmenu/menu_filesel.c
	libmenu/menu_pt.c
2008-06-23 03:58:44 +03:00
diego
131125fe0e Add missing #includes to fix 'make checkheaders'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27093 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-17 08:44:03 +00:00
Uoti Urpala
0885f4e5b5 Move vf_settings to options struct 2008-04-26 01:19:29 +03:00
Uoti Urpala
60e2c8604d Move movie_aspect to options struct 2008-04-25 03:34:28 +03:00
Uoti Urpala
0a39709c15 Move screen_size_xy to options struct 2008-04-25 03:34:28 +03:00
Uoti Urpala
1351b50ea5 Move flip and softzoom to options struct 2008-04-25 03:34:27 +03:00
Uoti Urpala
f8934a5f12 Modify option helper macros
Give them a OPT_ prefix, move them to m_option.h, move the "flags"
parameter to third position (so all start with option name, field
name, flags) and use "&m_option_type_x" in them instead of the
indirect #define "CONF_TYPE_X".
2008-04-24 02:41:29 +03:00
Uoti Urpala
d9aa368a6d Move playback_speed to options struct 2008-04-23 13:48:37 +03:00
Uoti Urpala
c2a36d9264 Move option helper #defines to cfg-common.h for now 2008-04-23 13:48:37 +03:00
albeu
6e62b3a85f Add options to disable some or all config files.
Patch by Andrew Savchenko (Bircoph -at- list -dot- ru).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26448 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-14 11:21:29 +00:00
zuxy
b74750a948 Enable runtime control for colorful and/or module name output
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26402 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 12:51:07 +00:00
diego
4bec934234 Split cfg-common.h into two separate header files. It was being included twice
with different definitions set that activated either the lower or the upper
half of the header. The effectively simulated using two different header files.
It is more straightforward to split the header instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26392 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 09:48:36 +00:00
diego
2a9e515c77 Move duplicated extern declarations of mp_msg_levels and mp_msg_level_all
to cfg-common.h where they are really needed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26162 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-04 21:45:36 +00:00
diego
3cd1f73f70 Add comments to #endif preprocessor directives.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26158 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-04 19:34:56 +00:00
diego
64ab68dc1d Simplify preprocessor conditionals: USE_LIBAV* is defined when compiling
against both shared and static libraries.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26157 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-04 19:30:35 +00:00
reimar
6af3af64c2 Make -af-pre, -af-add, -af-del and -af-clr available.
For this -af-adv must be moved below af* to match first.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26018 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-17 15:14:54 +00:00
reimar
c1a683ad8c Change force_fps and force_ofps to double
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25997 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-14 14:50:34 +00:00
reimar
1b2d30c221 Change mf_fps to double
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25996 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-14 14:44:52 +00:00
diego
4a78a92dd6 Add a comment that explains why this header has no multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25580 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 21:20:06 +00:00
ulion
4f4c08415c Fix libass to support -nofontconfig.
For history reason, fontconfig is auto-enabled when ass is enabled,
we keep this behavior and document it clearly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25379 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-12 10:00:34 +00:00
reimar
b8a403f124 Make m_option_t arrays referenced by cfg-common.h const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25269 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 21:26:23 +00:00
reimar
37235a01d9 Make the main m_option_t arrays const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25261 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 16:45:34 +00:00
reimar
1bf629e38e Move fakemono extern to cfg-common.h where it is actually used.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25259 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 16:10:56 +00:00
reimar
54016c6776 Remove pointless ifdefs around extern declarations
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25258 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 16:08:07 +00:00
voroshil
45287b2c2b DirectShow based tv:// driver for win32
Teletext is also supported (but 625 system parameters are hardcoded).
pthreads is required for teletext.

Code is still experimental.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24772 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-13 17:14:39 +00:00
lu_zero
0ff4b3fd9f libnemesi support, yet another rtsp/rtp library...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24584 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-19 21:38:22 +00:00
voroshil
fdb78c2bea Implement setting gain control for video devices (usually webcams)
in v4l2 tv:// driver.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24573 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-18 16:28:39 +00:00
diego
7415e7aad1 warning fix:
cfg-common.h:347: warning: redundant redeclaration of 'vd_use_slices'
libmpcodecs/vd.h:19: warning: previous declaration of 'vd_use_slices' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24397 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 10:57:40 +00:00
cehoyos
2ead315ddc Revert the part of r24389 that broke compilation of mencoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24396 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 08:47:55 +00:00
voroshil
dcfd44de77 Fix warnings:
cfg-common.h:386: warning: redundant redeclaration of 'audio_stream'
stream/stream.h:301: warning: previous declaration of 'audio_stream' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24394 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 01:13:13 +00:00
voroshil
255c174e41 Fix warnings:
cfg-common.h:509: warning: redundant redeclaration of 'fribidi_charset'
subreader.h:64: warning: previous declaration of 'fribidi_charset' was here
cfg-common.h:510: warning: redundant redeclaration of 'flip_hebrew'
subreader.h:65: warning: previous declaration of 'flip_hebrew' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24392 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 01:10:18 +00:00
voroshil
30699fd214 Fix warnings:
cfg-common.h:340: warning: redundant redeclaration of 'quiet'
mplayer.c:85: warning: previous definition of 'quiet' was here
cfg-common.h:341: warning: redundant redeclaration of 'verbose'
mp_msg.h:6: warning: previous declaration of 'verbose' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24391 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 01:09:49 +00:00
voroshil
bfbc21e736 fix warnings:
cfg-common.h:399: warning: redundant redeclaration of 'edl_filename'
edl.h:23: warning: previous declaration of 'edl_filename' was here
cfg-common.h:400: warning: redundant redeclaration of 'edl_output_filename'
edl.h:24: warning: previous declaration of 'edl_output_filename' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24390 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 01:09:08 +00:00
voroshil
69b3616784 Fix warnings:
cfg-common.h:349: warning: redundant redeclaration of 'vd_use_slices'
libmpcodecs/vd.h:19: warning: previous declaration of 'vd_use_slices' was here
cfg-common.h:350: warning: redundant redeclaration of 'divx_quality'
libmpcodecs/dec_video.h:23: warning: previous declaration of 'divx_quality' was here


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24389 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-10 01:08:23 +00:00
voroshil
277dc43515 Option adevice is implemented for all tv:// drivers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24384 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-09 14:59:07 +00:00
diego
4e7f09313d Add comments to some #endif preprocessor directives.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24383 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-09 13:41:45 +00:00
voroshil
374e9dd5ba Support for selecting language via packet 28.
Also  allows to select default teletext language.
It will be used if language is not specified by network provider
via packet 28.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24310 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-31 16:53:27 +00:00
voroshil
4f0d56b9ae Teletext support.
Part 2/5: options/slaves/configure/definitions/etc


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23920 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-29 17:55:28 +00:00