Uoti Urpala
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
Uoti Urpala
1d1ddcb593
Move aspect.c options to option struct
2008-05-01 11:14:29 +03:00
Uoti Urpala
8de8be1536
Move input options to option struct
2008-04-30 19:34:48 +03:00
Uoti Urpala
06405a5ba5
Move key_fifo_size & doubleclick_time to options struct
2008-04-29 15:52:29 +03:00
Uoti Urpala
4db72f6a80
Move vo_gamma_* to options struct
2008-04-26 01:19:29 +03:00
Uoti Urpala
7dc4226348
Move vd_use_slices to options struct
2008-04-25 07:15:07 +03:00
Uoti Urpala
60e2c8604d
Move movie_aspect 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
3fa6f2d3e1
Move -lavdopts to options struct
2008-04-25 03:31:57 +03:00
Uoti Urpala
66bd120a3a
Move dvdsub_id to options struct
...
Name the field "sub_id" as it's not specific to DVD subs.
Remove some other unused extern declarations together with dvdsub_id
from demux_mkv.c and demux_lavf.c.
2008-04-23 13:48:38 +03:00
Uoti Urpala
c0c914effd
Move audio_id and video_id to options struct
2008-04-23 13:48:38 +03:00
Uoti Urpala
d9aa368a6d
Move playback_speed to options struct
2008-04-23 13:48:37 +03:00
Uoti Urpala
ef74d21b1f
Move loop_times to option struct
2008-04-23 13:47:44 +03:00
Uoti Urpala
9b06b5ed85
Move correct_pts to options struct
2008-04-23 13:41:05 +03:00
Uoti Urpala
732ee3474a
Move options "vo" and "ao" to common struct
2008-04-23 13:41:05 +03:00
Uoti Urpala
9db0c118d3
Start of new option system
...
First part of option restructuring. The aim is to move option values
from a huge number of separate globals to a single non-global struct.
This part adds some support for parsing option values into such struct
instances, and moves one example option (fixed-vo) to the struct.
2008-04-23 13:41:05 +03:00
