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 |
|
diego
|
c1f5c9bd3f
|
cosmetics: Remove pointless parentheses from return calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26786 b3059339-0415-0410-9bf9-f77b7e298cf2
|
2008-05-16 00:23:02 +00:00 |
|
Uoti Urpala
|
0e757bf9da
|
Remove _s/_st suffix from some struct names
Since the names are always used after the keyword "struct" having a
suffix as in "struct demuxer_st" is almost completely pointless.
|
2008-04-25 03:34:22 +03:00 |
|
reimar
|
b95c80ca86
|
Make all vf_info_t structs const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25249 b3059339-0415-0410-9bf9-f77b7e298cf2
|
2007-12-02 14:57:15 +00:00 |
|
reynaldo
|
b4c74fb28e
|
Part2 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu with LOTS of modifications by me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18005 b3059339-0415-0410-9bf9-f77b7e298cf2
|
2006-03-31 00:15:47 +00:00 |
|
diego
|
7416ded30b
|
Change 'if(verbose)' to the more appropriate mp_msg_test.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17970 b3059339-0415-0410-9bf9-f77b7e298cf2
|
2006-03-27 07:22:48 +00:00 |
|
michael
|
02b199e5e9
|
passing pts through the filter layer (lets see if pts or cola comes out at the end)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17907 b3059339-0415-0410-9bf9-f77b7e298cf2
|
2006-03-21 21:26:42 +00:00 |
|
diego
|
36e1974be0
|
Unify include path handling, -I.. is in CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17013 b3059339-0415-0410-9bf9-f77b7e298cf2
|
2005-11-18 14:39:25 +00:00 |
|
arpi
|
280fa83b42
|
2 new filters: tile & framestep
patch by Daniele Forghieri ( guru@digitalfantasy.it )
(little cleanup by me)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10752 b3059339-0415-0410-9bf9-f77b7e298cf2
|
2003-08-31 21:41:24 +00:00 |
|