ffmpeg - Mirror of FFmpeg git repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'qatar/master'	Michael Niedermayer	2011-10-13	1	-13/+13
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* qatar/master: (31 commits) tiffenc: initialize forgotten avctx. avplay: free the active audio packet at exit. avplay: free rdft data used for spectrogram analysis. log.h: make AVClass a named struct fix ac3 encoder documentation vc1: more prettyprinting cosmetics vc1: prettyprint some tables vc1: K&R formatting cosmetics AVOptions: bump minor and add APIchanges entry. cmdutils/avtools: simplify show_help() by using av_opt_child_class_next() AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_* Remove all uses of deprecated AVOptions API. AVOptions: add av_opt_next, deprecate av_next_option. AVOptions: add functions for evaluating option strings. AVOptions: split get_number(). AVOptions: add av_opt_get, deprecate av_get. AVOptions: add av_opt_set*(). AVOptions: add new API for enumerating children. rv34: move inverse transform functions to DSP context flvenc: Write the right metadata entry count ... Conflicts: avconv.c cmdutils.c doc/APIchanges ffplay.c ffprobe.c libavcodec/ac3dec.c libavcodec/h264.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options.c libavdevice/libdc1394.c libavdevice/v4l2.c libavfilter/vf_drawtext.c libavformat/flvdec.c libavformat/mpegtsenc.c libavformat/options.c libavutil/avutil.h libavutil/opt.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*	Anton Khirnov	2011-10-12	1	-13/+13
\| \|
* \|	Merge remote-tracking branch 'qatar/master'	Michael Niedermayer	2011-09-12	1	-27/+99
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* qatar/master: adpcm: split ADPCM encoders and decoders into separate files. doc/avconv: fix typo. rv34: check that subsequent slices have the same type as first one. smacker demuxer: handle possible av_realloc() failure. lavfi: add split filter from soc. lavfi: add showinfo filter libxavs: add private options corresponding to deprecated global options Conflicts: Changelog libavcodec/adpcm.c libavfilter/avfilter.h libavfilter/vf_showinfo.c libavfilter/vf_split.c libavformat/smacker.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	libxavs: add private options corresponding to deprecated global options	Anton Khirnov	2011-09-12	1	-27/+99
\| \| \| \| \| \| \| \|	Code mostly copied from libx264 wrapper.
\| *	Replace deprecated FF__TYPE symbols with AV_PICTURE_TYPE_.	Stefano Sabatini	2011-05-02	1	-3/+3
\| \| \| \| \| \| \| \|	Signed-off-by: Diego Biurrun <diego@biurrun.de>
\| *	Replace FFmpeg with Libav in licence headers	Mans Rullgard	2011-03-19	1	-4/+4
\| \| \| \| \| \| \| \|	Signed-off-by: Mans Rullgard <mans@mansr.com>
\| *	Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.	Diego Elio Pettenò	2011-01-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
* \|	replace deprecated FF__TYPE symbols with AV_PICTURE_TYPE_	Stefano Sabatini	2011-05-02	1	-3/+3
\| \|
* \|	Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.	Diego Elio Pettenò	2011-01-28	1	-1/+1
\|/ \| \| \| \| \| \| \|	None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit d36beb3f6902b1217beda576aa18abf7eb72b03c)
*	Replace deprecated CODEC_TYPE_AUDIO and CODEC_TYPE_VIDEO with the	Stefano Sabatini	2010-09-25	1	-1/+1
\| \| \| \| \| \|	corresponding AVMEDIA_TYPE_* symbols. Originally committed as revision 25201 to svn://svn.ffmpeg.org/ffmpeg/trunk
*	add Chinese AVS encoding via external library libxavs	Stefan Gehrer	2010-07-27	1	-0/+351
	Originally committed as revision 24533 to svn://svn.ffmpeg.org/ffmpeg/trunk