ffmpeg/libavfilter
Michael Niedermayer 757473831c Merge remote-tracking branch 'qatar/master'
* qatar/master: (29 commits)
  cabac: Move code only used within the CABAC test program into the test program.
  vp56: Drop unnecessary cabac.h #include.
  h264-test: Initialize AVCodecContext.av_class.
  build: Skip compiling network.h and rtsp.h if networking is not enabled.
  cosmetics: drop some pointless parentheses
  Disable annoying warning without changing behavior
  faq: Solutions for common problems with sample paths when running FATE.
  avcodec: attempt to clarify the CODEC_CAP_DELAY documentation
  avcodec: fix avcodec_encode_audio() documentation.
  FATE: xmv-demux test; exercise the XMV demuxer without decoding the perceptual codecs inside.
  vqf: recognize more metadata chunks
  FATE test: BMV demuxer and associated video and audio decoders.
  FATE: indeo4 video decoder test.
  FATE: update xxan-wc4 test to a sample with more code coverage.
  Change the recent h264_mp4toannexb bitstream filter test to output to an elementary stream rather than a program stream.
  g722enc: validate AVCodecContext.trellis
  g722enc: set frame_size, and also handle an odd number of input samples
  g722enc: split encoding into separate functions for trellis vs. no trellis
  mpegaudiodec: Use clearer pointer math
  tta: Fix returned error code at EOF
  ...

Conflicts:
	libavcodec/h264.c
	libavcodec/indeo3.c
	libavcodec/interplayvideo.c
	libavcodec/ivi_common.c
	libavcodec/libxvidff.c
	libavcodec/mpegvideo.c
	libavcodec/ppc/mpegvideo_altivec.c
	libavcodec/tta.c
	libavcodec/utils.c
	libavfilter/vsrc_buffer.c
	libavformat/Makefile
	tests/fate/indeo.mak
	tests/ref/acodec/g722

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-08 03:34:22 +01:00
..
libmpcodecs
x86
Makefile lavfi: add amerge audio filter. 2011-12-31 16:25:11 +01:00
af_aconvert.c Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
af_aconvert_rematrix.c
af_aformat.c
af_amerge.c lavfi: add amerge audio filter. 2011-12-31 16:25:11 +01:00
af_anull.c
af_aresample.c
af_ashowinfo.c
af_asplit.c lavfi: add asplit filter 2011-12-27 15:21:08 +01:00
af_astreamsync.c af_astreamsync: remove unused variable 2012-01-01 16:43:32 +01:00
af_earwax.c
af_pan.c lavfi: reimplement MPlayer's af_pan filter for libavfilter. 2011-11-18 19:39:26 +01:00
af_volume.c volume: remove duplicated condition. 2012-01-05 21:53:18 +01:00
all_channel_layouts.h
allfilters.c lavfi: add amerge audio filter. 2011-12-31 16:25:11 +01:00
asink_anullsink.c
asrc_abuffer.c Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
asrc_abuffer.h
asrc_aevalsrc.c aevalsrc: add duration option 2011-12-04 21:13:22 +01:00
asrc_anullsrc.c Merge remote-tracking branch 'qatar/master' 2011-11-26 01:12:08 +01:00
avcodec.c Merge remote-tracking branch 'qatar/master' 2011-12-26 04:10:47 +01:00
avcodec.h Merge remote-tracking branch 'qatar/master' 2011-12-26 04:10:47 +01:00
avfilter.c lavfi: add missing check in avfilter_filter_samples() 2011-12-27 15:21:00 +01:00
avfilter.h Disable annoying warning without changing behavior 2012-01-07 12:46:57 -08:00
avfiltergraph.c
avfiltergraph.h graphparser: Fix doxy on avfilter_graph_parse() return value. 2011-11-22 15:09:26 +01:00
buffersink.h buffersink: Implement a poll function. 2011-12-08 21:19:23 +01:00
buffersrc.h lavfi: add a new function av_buffersrc_buffer(). 2011-12-25 16:18:57 +01:00
defaults.c lavfi: fix avfilter_default_get_audio_buffer() after changes in av_samples_alloc() 2011-12-27 15:20:54 +01:00
drawutils.c
drawutils.h
formats.c sink_buffer: copy list of provided formats in the context 2011-12-22 10:09:42 +01:00
gradfun.h
graphparser.c
internal.h sink_buffer: copy list of provided formats in the context 2011-12-22 10:09:42 +01:00
libavfilter.v
sink_buffer.c sink_buffer: copy list of provided formats in the context 2011-12-22 10:09:42 +01:00
src_movie.c Merge remote-tracking branch 'qatar/master' 2011-12-26 04:10:47 +01:00
transform.c cleanup: for(int 2011-12-13 21:08:43 +01:00
transform.h
vf_aspect.c
vf_ass.c lavfi: add libass based subtitles renderer 2011-11-26 10:42:33 +01:00
vf_blackframe.c
vf_boxblur.c vf_boxblur: fix memleak 2011-11-25 04:45:41 +01:00
vf_copy.c
vf_crop.c
vf_cropdetect.c
vf_delogo.c
vf_deshake.c
vf_drawbox.c
vf_drawtext.c drawtext: fix hard dependency to lavc (timecode). 2012-01-02 15:33:56 +01:00
vf_fade.c
vf_fieldorder.c
vf_fifo.c Fix various if parenthesis misplacements. 2011-11-21 19:35:33 +01:00
vf_format.c
vf_frei0r.c
vf_gradfun.c
vf_hflip.c
vf_hqdn3d.c
vf_libopencv.c
vf_lut.c
vf_mp.c vf_mp: rewrite vf_mp filter warning message 2011-11-23 13:22:46 +01:00
vf_null.c
vf_overlay.c
vf_pad.c pad: fix format string length 2011-11-14 05:42:10 +01:00
vf_pixdesctest.c
vf_scale.c vf_scale: give a clue in case of invalid expression self-reference 2011-12-06 15:03:51 +01:00
vf_select.c cleanup: remove various double end ';' all over the code. 2011-11-16 07:48:23 +01:00
vf_setpts.c
vf_settb.c
vf_showinfo.c
vf_slicify.c
vf_split.c
vf_thumbnail.c thumbnail: fix error code in case of invalid args. 2011-12-27 11:15:21 +01:00
vf_tinterlace.c vf_tinterlace: implement interlace mode 5 2012-01-01 16:16:50 +01:00
vf_transpose.c
vf_unsharp.c
vf_vflip.c
vf_yadif.c Merge remote-tracking branch 'qatar/master' 2011-12-13 23:21:37 +01:00
vsink_nullsink.c
vsrc_buffer.c Merge remote-tracking branch 'qatar/master' 2012-01-08 03:34:22 +01:00
vsrc_buffer.h
vsrc_cellauto.c lavfi: add cellauto source 2011-12-11 11:55:33 +01:00
vsrc_color.c
vsrc_life.c life: add mold, mold_color, life_color and death_color options. 2011-12-11 14:14:01 +01:00
vsrc_mandelbrot.c vsrc_mandelbrot: Fix vsrc_mandelbrot.c:358:85: warning: ‘epsilon’ may be used uninitialized in this function [-Wuninitialized] 2011-11-24 00:08:05 +01:00
vsrc_mptestsrc.c
vsrc_testsrc.c
yadif.h