RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity
28,296 Commits 41 Branches 85 Tags 164 MiB
Commit Graph

33 Commits

Author SHA1 Message Date
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
diego c32f706c96 Do not #include libavutil/common.h. It is not used directly and mpbswap.h 
now #includes all required headers on its own.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26312 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-04-01 14:19:45 +00:00
diego 835c654bb0 typo fix: inited --> initialized 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-02-14 14:23:55 +00:00
diego 37fe15b1c8 warning fix: 
ve_qtvideo.c: At top level:
ve_qtvideo.c:109: warning: 'decompressor' defined but not used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24267 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-08-28 16:59:24 +00:00
diego ed6463333f Fix unused variable warning. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24145 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-08-25 00:23:38 +00:00
diego 20d778b3fa Add explicit location for headers from the libmpdemux/ directory. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22619 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-15 17:51:32 +00:00
diego 6b14d50848 Add explicit location for headers from the stream/ directory. 
Now for the encoding-related files as well.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22618 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-15 17:30:55 +00:00
diego 6222e5c9de Include loader/ prefix in #include path everywhere. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22595 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-03-15 08:29:24 +00:00
nicodvb cf099b2100 muxers now write to output muxer->stream rather than to muxer->file 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21676 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-18 21:03:59 +00:00
reimar 18004d2d98 Hack around libavutil/bswap.h compilation problems due to always_inline undefined. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21523 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-12-07 11:58:07 +00:00
diego cac6c0eea2 Remove bswap.h, use libavutil/bswap.h instead. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21388 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-11-29 15:02:45 +00:00
diego 60f223f766 Move #ifdefs around complete files into the build system. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18774 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-06-21 14:49:09 +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
michael e6338c5858 change muxer_write_chunk() so that pts/dts _could_ be passed from encoder to muxer 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17488 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-26 19:32:07 +00:00
rathann 2601de4120 massive attack: mp_msg printf format fixes 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17367 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-01-12 20:04:36 +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
reimar f9dfc7f46e typo, memset 0 was done on desc instead of cdesc, see bug #288 
Patch by Marcus Meissner [ meissner at suse de ]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15275 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-04-27 12:43:30 +00:00
henry dbb001bae2 replace VO and VF numeric flags with #defined identifiers 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15213 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-04-18 15:52:38 +00:00
henry 18abbb69a1 fixes for encoding of multiple files 
- do not uninitialize video encoder between files
- checks for image size & format change moved from mencoder.c to vfilters

by Oded Shimon <ods15@ods15.dyndns.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14879 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-03-01 20:21:58 +00:00
reimar b46fa6a150 Initialized BITMAPINFOHEADER to 0 to avoid problems, esp. windows has problems 
when unused parts have bogus values.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14550 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-01-20 22:53:37 +00:00
faust3 97372dab4f preload quicktime.qts, this allows us to ignore the hardcoded path inside the dlls so that quicktime.qts doesn't need to be in the windows system dir, patch by Gianluigi Tiesi <mplayer at netfarm.it>, comments by myself 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14529 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-01-17 20:57:48 +00:00
rathann d9a5e00183 small gcc warning fixes 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13189 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-08-28 20:59:49 +00:00
faust3 8a26a39a65 printf -> mp_msg; print error msg when qtmlClient.dll is missing 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12196 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-04-13 15:04:25 +00:00
ranma 7068c1b886 Use aspect from encoder for AVI vprp header 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12062 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-03-24 15:16:36 +00:00
faust3 c29267aa0b cygwin win32 dll support 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9436 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-02-15 17:45:10 +00:00
arpi ca0263659f compiler warning fixes patch by Dominik Mierzejewski <dominik@rangers.eu.org> 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9218 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-02-02 02:42:59 +00:00
arpi 489b07338c Cleanup of the muxer API, func parameters muxer & muxer_f eliminated. 
patch by Andriy N. Gritsenko <andrej@lucky.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9015 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-01-19 01:48:52 +00:00
arpi c11bd13ed6 compiler warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org> 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8734 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-01-03 12:26:17 +00:00
arpi bf46a109ed the long-waited MUXER layer, and new MPEG-PS muxer 
patch by Andriy N. Gritsenko <andrej@lucky.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8586 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-12-27 22:43:20 +00:00
arpi ac52ed1b31 set keyframe flag at encoding 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8512 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-12-21 20:42:40 +00:00
arpi 8dc0ce2ade Sorenson 1/3 encoding just for fun :) 
ve_qtvideo code by Sascha Sommer
SVQ3 support hack by /me


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8472 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-12-16 01:49:39 +00:00