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
af_aconvert.c
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
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
asrc_abuffer.h
asrc_aevalsrc.c
asrc_anullsrc.c
avcodec.c
avcodec.h
avfilter.c
avfilter.h Disable annoying warning without changing behavior 2012-01-07 12:46:57 -08:00
avfiltergraph.c
avfiltergraph.h
buffersink.h
buffersrc.h
defaults.c
drawutils.c
drawutils.h
formats.c
gradfun.h
graphparser.c
internal.h
libavfilter.v
Makefile lavfi: add amerge audio filter. 2011-12-31 16:25:11 +01:00
sink_buffer.c
src_movie.c
transform.c
transform.h
vf_aspect.c
vf_ass.c
vf_blackframe.c
vf_boxblur.c
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
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_null.c
vf_overlay.c
vf_pad.c
vf_pixdesctest.c
vf_scale.c
vf_select.c
vf_setpts.c
vf_settb.c
vf_showinfo.c
vf_slicify.c
vf_split.c
vf_thumbnail.c
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
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
vsrc_color.c
vsrc_life.c
vsrc_mandelbrot.c
vsrc_mptestsrc.c
vsrc_testsrc.c
yadif.h