Michael Niedermayer 988f585fcb Merge remote-tracking branch 'qatar/master' ... * qatar/master: (44 commits) replacement Indeo 3 decoder gsm demuxer: do not allocate packet twice. flvenc: use first packet delay as global delay. ac3enc: doxygen update. imc: return error codes instead of 0 for error conditions. imc: return meaningful error codes instead of -1 imc: do not set channel layout for stereo imc: validate channel count imc: check for ff_fft_init() failure imc: check output buffer size before decoding imc: use DSPContext.bswap16_buf() to byte-swap packet data rtsp: add allowed_media_types option libgsm: add flush function to reset the decoder state when seeking libgsm: simplify decoding by using a loop gsm: log error message when packet is too small libgsmdec: do not needlessly set *data_size to 0 gsmdec: do not needlessly set *data_size to 0 gsmdec: add flush function to reset the decoder state when seeking libgsmdec: check output buffer size before decoding gsmdec: log error message when output buffer is too small. ... Conflicts: Changelog ffplay.c libavcodec/indeo3.c libavcodec/mjpeg_parser.c libavcodec/vp3.c libavformat/cutils.c libavformat/id3v2.c libavutil/parseutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-11-03 02:16:26 +01:00
..
libmpcodecs	libavfilter/libmpcodecs: add vf_stereo3d support	2011-09-20 05:49:42 +02:00
x86
af_aconvert_rematrix.c
af_aconvert.c	lavu: add av_strtok()	2011-10-18 18:21:03 +02:00
af_aformat.c	lavu: add av_strtok()	2011-10-18 18:21:03 +02:00
af_anull.c
af_aresample.c	af_aresample: fix properties setting in the output buffer	2011-10-16 00:52:23 +02:00
af_ashowinfo.c	ashowinfo: fix typo in description.	2011-10-27 22:16:24 +02:00
all_channel_layouts.h
allfilters.c	lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs	2011-10-19 07:09:08 +02:00
asink_anullsink.c
asrc_abuffer.c	lavu: add av_strtok()	2011-10-18 18:21:03 +02:00
asrc_abuffer.h
asrc_aevalsrc.c	asrc_aevalsrc: apply misc cleanup in the options array	2011-10-18 18:52:50 +02:00
asrc_anullsrc.c	AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*.	2011-10-17 07:33:10 +02:00
avcodec.c
avcodec.h
avfilter.c	lavfi: add debug trace when processing events	2011-09-25 22:47:51 +02:00
avfilter.h	lavfi: bump micro after recent changes in the overlay filter	2011-10-31 11:19:53 +01:00
avfiltergraph.c	lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()	2011-09-28 08:02:53 +02:00
avfiltergraph.h	Merge remote-tracking branch 'qatar/master'	2011-09-29 01:11:01 +02:00
buffersink.h
defaults.c
drawutils.c	lavfi: add internal function ff_fill_rgba_map()	2011-10-28 02:06:50 +02:00
drawutils.h	lavfi: add internal function ff_fill_rgba_map()	2011-10-28 02:06:50 +02:00
formats.c	lavfi: add LUT (LookUp Table) generic filters	2011-10-17 18:05:38 +02:00
gradfun.h
graphparser.c	lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()	2011-09-28 08:02:53 +02:00
internal.h	lavfi: add LUT (LookUp Table) generic filters	2011-10-17 18:05:38 +02:00
libavfilter.v
Makefile	lavfi: rewrite nullsrc using the code in vsrc_testsrc.c	2011-10-24 17:46:48 +02:00
sink_buffer.c	sink_buffer: fix typo	2011-09-28 22:28:47 +02:00
src_movie.c	src_movie: Fix incompatible pointer type warning.	2011-10-19 00:03:56 +02:00
transform.c	doxygen: remove a few @file parameters.	2011-10-04 08:04:17 +02:00
transform.h	lavfi: add missing header mulitple-inclusion guard in transform.h	2011-10-20 15:59:20 +02:00
vf_aspect.c
vf_blackframe.c
vf_boxblur.c	vf_boxblur: fix slice-drawing	2011-10-23 23:54:37 +02:00
vf_copy.c
vf_crop.c	vf_crop: remove mathematical constants now redundant.	2011-10-13 18:08:51 +02:00
vf_cropdetect.c
vf_delogo.c	Merge remote-tracking branch 'qatar/master'	2011-10-18 01:54:40 +02:00
vf_deshake.c	deshake: limit deshake to specific area to search for motion vectors.	2011-10-20 00:39:34 +02:00
vf_drawbox.c
vf_drawtext.c	Merge remote-tracking branch 'qatar/master'	2011-11-03 02:16:26 +01:00
vf_fade.c	vf_fade: fade to correct CCIR601/709 black level	2011-11-02 21:44:13 +01:00
vf_fieldorder.c
vf_fifo.c
vf_format.c
vf_frei0r.c	lavu: add av_strtok()	2011-10-18 18:21:03 +02:00
vf_gradfun.c
vf_hflip.c
vf_hqdn3d.c
vf_libopencv.c
vf_lut.c	Merge remote-tracking branch 'qatar/master'	2011-10-18 01:54:40 +02:00
vf_mp.c	vf_mp: Fix several incompatible pointer type warnings.	2011-10-19 00:05:30 +02:00
vf_null.c
vf_overlay.c	vf_overlay: adopts FAST_DIV255 macro for calculating destination alpha	2011-11-02 21:44:13 +01:00
vf_pad.c	vf_pad: Fix alignment of get_video_buffer()	2011-10-27 03:46:09 +02:00
vf_pixdesctest.c	vf_pixdesctest: Fix incompatible pointer type warning.	2011-10-18 23:59:59 +02:00
vf_scale.c	vf_scale: Request an aligned buffer.	2011-10-27 03:46:50 +02:00
vf_select.c	vf_select: remove mathematical constants now redundant.	2011-10-13 18:08:50 +02:00
vf_setpts.c	vf_setpts: remove mathematical constants now redundant.	2011-10-13 18:08:50 +02:00
vf_settb.c	vf_settb: remove mathematical constants now redundant.	2011-10-13 18:08:50 +02:00
vf_showinfo.c	vf_showinfo: print checksums in hexadecimal.	2011-10-27 22:14:57 +02:00
vf_slicify.c
vf_split.c
vf_transpose.c	vf_transpose: remove pix_fmts which can currently not be supported.	2011-11-01 23:45:28 +01:00
vf_unsharp.c	vf_unsharp: Fix false ‘src2’ may be used uninitialized in this function warning.	2011-10-19 00:04:33 +02:00
vf_vflip.c
vf_yadif.c	yadif: Fix assignment from incompatible pointer type warning	2011-10-18 23:59:20 +02:00
vsink_nullsink.c
vsrc_buffer.c	vsrc_buffer: FIx incompatible pointer type warning	2011-10-18 23:58:41 +02:00
vsrc_buffer.h	vsrc_buffer: remove duplicated file description	2011-09-19 12:43:10 +02:00
vsrc_color.c	vsrc_color: use internal timebase	2011-09-28 08:03:11 +02:00
vsrc_mptestsrc.c	AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*.	2011-10-17 07:33:10 +02:00
vsrc_testsrc.c	Merge remote-tracking branch 'qatar/master'	2011-11-03 02:16:26 +01:00
yadif.h