4c6e3ac01b
Merge svn change r31134
...
Fix some search/replace errors introduced in the svn commit.
2010-05-07 22:03:48 +03:00
a535f7bfca
the great MPlayer tab removal: part II
...
some extra indentation fixes are put in as a bonus
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31134 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-03 23:34:38 +00:00
8df340271e
Merge svn changes up to r31040
2010-04-26 18:38:11 +03:00
e913d6c5da
Merge svn changes up to r31004
2010-04-26 17:55:05 +03:00
082287f3a3
cfg-mplayer.h: add casts to silence warnings
2010-04-25 23:00:19 +03:00
12d6f6b378
Remove commented-out and long-gone dapsync options.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31040 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-15 23:01:06 +00:00
d2d509dc39
Mark dxr2_opts array as const.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30998 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:08:15 +00:00
c37f09693d
Merge svn changes up to r30643
2010-03-10 00:00:06 +02:00
12d3caebc7
Merge svn changes up to r30475
2010-03-09 19:18:43 +02:00
36a14ac50c
Declare externally used variables from vd.c as extern in vd.h.
...
This saves declaring them as extern all over the place.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30695 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-22 09:51:44 +00:00
8ba6b4eaf9
cosmetics: Remove pointless empty lines at EOF.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30675 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-20 21:02:49 +00:00
eea4f2238b
Add header for functions exported from vo_zr.c and use it appropriately.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30635 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-18 10:19:42 +00:00
352dfc79e4
Remove forward declarations for non-existing functions readPPOpt, revertPPOpt.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30634 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-18 09:41:52 +00:00
99c1bbca2a
Add license header to all top-level files missing them.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30471 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-30 23:24:23 +00:00
74b7dcc5f4
core: Add support for decoder reordering of pts values
...
Add a mode where libavcodec's reordered_opaque feature is used to
associate container packet timestamps with decoded frames. This should
improve behavior at least for MPEG files with interlaced h264; the
previous code does not cope well with the libavformat demuxer
producing two field packets with separate timestamps but the
libavcodec h264 decoder only producing a single output frame for those
two packets (so half the timestamps have no associated output frame).
The current libavformat mpeg demuxer seems to finally work with
interlaced h264 files and produce valid timestamps which are useful
with a mode like this.
By default MPlayer now selects between this new mode and the old one
automatically based on the number of timestamp problems they cause; by
default the new mode is used if both seem to work. The new option
-pts-association-mode can be used to force a particular mode. If
correct-pts mode is disabled this has no effect on timing.
Also remove the "EXPERIMENTAL" marker from the manpage description of
-correct-pts.
2009-11-21 20:53:10 +02:00
287b62163e
Merge svn changes up to r29912
2009-11-16 07:01:46 +02:00
ab4bdb64e1
Added -name, -title and -use-filename-title options and implementation in X11 vos
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29904 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-12 09:21:53 +00:00
87366694d8
Remove the internal GUI
...
The GUI is badly designed and too closely coupled to the internal
details of other code. The GUI code is in bad shape and unmaintained
for years. There is no indication that anyone would maintain it in the
future either. Even if someone did volunteer to implement a better
integrated GUI having the current code in the tree probably wouldn't
help much. So get rid of it.
2009-07-07 21:49:42 +03:00
0eb321bf2c
Remove trailing whitespace from most files
2009-07-07 02:34:35 +03:00
6e9cbdc104
whitespace cosmetics: Remove all trailing whitespace.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
96daf7ed5e
Add option -noordered-chapters.
2009-04-08 02:42:19 +03:00
694c067e19
options: Move osd_level and osd_duration to options struct
2009-03-31 18:24:10 +03:00
8ca11dda9e
VO: Don't force window position in X11 VOs
...
Disable by default the code that forcefully moved the video output
window to the middle of the screen whenever it was reconfigured or
created. That behavior was really annoying when switching video
streams within a file, and overriding the window manager like that is
not good default behavior for the initial creation of a window either.
Add a new option "-force-window-position" that can be used to restore
the old behavior.
2009-03-31 18:23:45 +03:00
e0172b96e3
Merge svn changes up to r28862
2009-03-07 01:04:41 +02:00
8864662b13
Make WinID a 64 bit integer, this should avoid issues with valid Window
...
handles on windows being interpreted as "no wid set".
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28795 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-02 11:24:20 +00:00
8c144171bb
Merge svn changes up to r28087
...
Conflicts:
command.c
libao2/ao_ivtv.c
libao2/ao_v4l2.c
libmpcodecs/dec_video.h
libvo/aspect.h
libvo/sub.c
libvo/sub.h
libvo/vo_directx.c
libvo/vo_macosx.m
libvo/vo_quartz.c
mp_core.h
mplayer.c
mplayer.h
osdep/getch2.h
osdep/timer.h
2008-12-04 01:55:52 +02:00
0864f92e7a
Get rid of pointless 'extern' keywords.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 23:01:03 +00:00
e46ce9c0ac
Merge svn changes up to r27899
2008-11-06 20:41:40 +02:00
74dd64e71d
Add an option that sets initial playback volume.
...
patch by Reimar and rvm, rvm3000 ya com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27872 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-31 18:44:45 +00:00
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
e0b1c9a6b7
Give a CONFIG_ prefix to preprocessor directives that lacked one and
...
change arbitrary prefixes to CONFIG_.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 12:20:50 +00:00
091d352d06
Rename font-related preprocessor directives.
...
Switch them from a HAVE_ to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 10:36:07 +00:00
141e81cce4
Rename a bunch of miscellaneous preprocessor directives.
...
Switch them from a HAVE_ to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27423 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 08:58:07 +00:00
0a749ffdc5
Rename preprocessor directives related to image libraries.
...
Change a HAVE_ prefix to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27417 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-05 08:47:51 +00:00
82f319af62
Change a bunch of X11-specific preprocessor directives.
...
Switch from a HAVE_ prefix to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27409 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-04 06:16:23 +00:00
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
6cce822505
Merge svn changes up to r27399
...
Conflicts:
libmpcodecs/vd.c
libmpcodecs/ve_raw.c
libvo/video_out.c
libvo/x11_common.c
mplayer.c
2008-08-02 22:04:35 +03:00
e588ab056d
Change a bunch of video-output-specific preprocessor directives from a HAVE_
...
prefix to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27397 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-02 17:38:11 +00:00
d17f9943af
Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate;
...
CONFIG_ prefix for configurable options, HAVE_ for system-dependent stuff.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27391 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-01 20:28:58 +00:00
6138ec05eb
Rename preprocessor directive HAVE_MENU --> CONFIG_MENU.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27377 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-30 18:07:19 +00:00
3b31fa5717
Rename two GUI-related preprocessor directives:
...
HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27375 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-30 13:44:59 +00:00
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
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
d5c868325c
Merge svn changes up to r26979
...
Most of the conflicts are trivial.
Conflicts:
Makefile
cfg-mplayer.h
input/input.c
libmenu/vf_menu.c
libmpcodecs/dec_video.c
libmpcodecs/vf_expand.c
libmpcodecs/vf_vo.c
libmpdemux/demux_mkv.c
libmpdemux/demuxer.c
libmpdemux/demuxer.h
libvo/vo_directfb2.c
libvo/vo_gl.c
libvo/vo_winvidix.c
libvo/vo_xv.c
libvo/vo_xvidix.c
libvo/vo_xvmc.c
libvo/x11_common.c
mplayer.c
osdep/timer-linux.c
stream/cache2.c
2008-06-04 08:10:48 +03:00
44d512d97e
remove extra dash in nocorrect-pts option
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26842 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-21 15:11:49 +00:00
1d1ddcb593
Move aspect.c options to option struct
2008-05-01 11:14:29 +03:00
d3113662b0
Mark option -key-fifo-size global
...
The fifo is only allocated once and not resized later. After the
previous commit trying to change it for later files would have no
effect. With older code it could cause memory corruption if you set
the option to a value larger than the already allocated size.
2008-04-29 15:52:32 +03:00
06405a5ba5
Move key_fifo_size & doubleclick_time to options struct
2008-04-29 15:52:29 +03:00
529d106627
Silence "discards qualifiers" warnings when compiling mplayer.c
...
Add casts to subconfig entries in option lists to avoid the excessive
amount of "initialization discards qualifiers from pointer target
type" warnings. Also add const to the type of mpctx_get_audio_out to
eliminate a warning and make it match the type in the header (svn
r25793 had added a const to the header but not mplayer.c). Make
libmenu_vfs a table of pointers to const to eliminate another warning
plus make the table itself const.
2008-04-26 11:03:12 +03:00
4db72f6a80
Move vo_gamma_* to options struct
2008-04-26 01:19:29 +03:00
Uoti Urpala
diego
ptt
Anton Khirnov
reimar
Uoti Urpala
compn