FFmpeg/libavfilter
Michael Niedermayer 184fc600e1 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  mpegvideo_enc: only allocate output packet when we know there will be output
  Add names for more channel layouts to the channel layout map.
  sunrast: Add a sample request for RMP_RAW colormap.
  avcodec: do not override pts or duration from the audio encoder
  Add prores regression test.
  Enable already existing rso regression test.
  Add regression test for "sox" format muxer/demuxer.
  Add dpx encoding regression test.
  swscale: K&R formatting cosmetics for PowerPC code (part I/II)
  img2: Use ff_guess_image2_codec(filename) shorthand where appropriate.
  Clarify licensing information about files borrowed from libjpeg.
  Mark mutable static data const where appropriate.
  avplay: fix -threads option
  dvbsubdec: avoid undefined signed left shift in RGBA macro
  mlpdec: use av_log_ask_for_sample()
  gif: K&R formatting cosmetics
  png: make .long_name more descriptive
  movdec: Adjust keyframe flagging in fragmented files
  rv34: change most "int stride" into "ptrdiff_t stride".

Conflicts:
	avprobe.c
	ffplay.c
	libavcodec/mlpdec.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pngenc.c
	libavcodec/x86/v210-init.c
	libavfilter/vf_boxblur.c
	libavfilter/vf_crop.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_select.c
	libavfilter/vf_setpts.c
	libavfilter/vf_settb.c
	libavformat/img2.c
	libavutil/audioconvert.c
	tests/codec-regression.sh
	tests/lavf-regression.sh
	tests/ref/lavf/dpx
	tests/ref/vsynth1/prores
	tests/ref/vsynth2/prores

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-22 02:24:18 +01:00
..
libmpcodecs
x86
af_aconvert.c
af_aformat.c
af_amerge.c
af_anull.c
af_aresample.c
af_ashowinfo.c
af_asplit.c
af_astreamsync.c
af_earwax.c
af_pan.c af_pan: move query_format before config_props. 2012-02-20 23:36:03 +01:00
af_silencedetect.c
af_volume.c
all_channel_layouts.h
allfilters.c
asink_anullsink.c
asrc_abuffer.c lavfi/abuffer: init the data planes with NULL pointers. 2012-02-21 16:45:34 +01:00
asrc_abuffer.h
asrc_aevalsrc.c
asrc_anullsrc.c
avcodec.c
avcodec.h
avfilter.c
avfilter.h
avfiltergraph.c
avfiltergraph.h
buffersink.h
buffersrc.h
defaults.c
drawutils.c
drawutils.h
formats.c
gradfun.h
graphdump.c
graphparser.c
internal.h
libavfilter.v
Makefile
sink_buffer.c
src_movie.c
transform.c
transform.h
version.h
vf_aspect.c
vf_ass.c
vf_blackframe.c
vf_boxblur.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
vf_copy.c
vf_crop.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
vf_cropdetect.c
vf_delogo.c
vf_deshake.c
vf_drawbox.c
vf_drawtext.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +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 Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
vf_mp.c
vf_null.c
vf_overlay.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
vf_pad.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
vf_pixdesctest.c
vf_scale.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
vf_select.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
vf_setfield.c
vf_setpts.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
vf_settb.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
vf_showinfo.c
vf_slicify.c
vf_split.c
vf_thumbnail.c
vf_tinterlace.c
vf_transpose.c
vf_unsharp.c
vf_vflip.c
vf_yadif.c
vsink_nullsink.c
vsrc_buffer.c
vsrc_buffer.h
vsrc_cellauto.c
vsrc_color.c
vsrc_life.c
vsrc_mandelbrot.c
vsrc_mptestsrc.c
vsrc_testsrc.c
yadif.h