ffmpeg - Mirror of FFmpeg git repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'qatar/master'	Michael Niedermayer	2011-07-17	1	-6/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* qatar/master: ffmpeg: fix some indentation ffmpeg: fix operation with --disable-avfilter simple_idct: remove disabled code motion_est: remove disabled code vc1: remove disabled code fate: separate lavf-mxf_d10 test from lavf-mxf cabac: Move code only used in the cabac test program to cabac.c. ffplay: warn that -pix_fmt is no longer working, suggest alternative ffplay: warn that -s is no longer working, suggest alternative lavf: rename enc variable in utils.c:has_codec_parameters() lavf: use designated initialisers for all (de)muxers. wav: remove a use of deprecated AV_METADATA_ macro rmdec: remove useless ap parameter from rm_read_header_old() dct-test: remove write-only variable des: fix #if conditional around P_shuffle Use LOCAL_ALIGNED in ff_check_alignment() Conflicts: ffmpeg.c libavformat/avidec.c libavformat/matroskaenc.c libavformat/mp3enc.c libavformat/oggenc.c libavformat/utils.c tests/ref/lavf/mxf Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	lavf: use designated initialisers for all (de)muxers.	Anton Khirnov	2011-07-17	1	-6/+4
\| \| \| \| \| \| \| \|	It's more readable and less prone to breakage.
\| *	Replace FFmpeg with Libav in licence headers	Mans Rullgard	2011-03-19	1	-4/+4
\| \| \| \| \| \| \| \|	Signed-off-by: Mans Rullgard <mans@mansr.com>
\| *	avio: avio_ prefix for url_fsize	Anton Khirnov	2011-03-07	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
\| *	Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.	Diego Elio Pettenò	2011-01-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts.
* \|	avio: avio_ prefix for url_fsize	Anton Khirnov	2011-03-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 76aa876e69cf78a40821e66dec0a1006e4eb23ec)
* \|	Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.	Diego Elio Pettenò	2011-01-28	1	-1/+1
\|/ \| \| \| \| \|	This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts. (cherry picked from commit c6610a216ed2948885772154a2eed696e0cb4aca)
*	Define AVMediaType enum, and use it instead of enum CodecType, which	Stefano Sabatini	2010-03-30	1	-1/+1
\| \| \| \| \| \|	is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
*	CD+G demuxer and decoder	Michael Tison	2009-12-17	1	-0/+66
	Patch by Michael Tison (gmail address: blackspike@....) Originally committed as revision 20890 to svn://svn.ffmpeg.org/ffmpeg/trunk