1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
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 Revert "vf_fspp: use LOCAL_MANGLE instead of MANGLE." 2012-02-08 23:16:32 +01:00
x86 Merge remote-tracking branch 'qatar/master' 2012-02-10 01:20:07 +01:00
af_aconvert.c lavfi/aconvert: use libswresample. 2012-02-02 14:31:18 +01:00
af_aformat.c lavfi/aformat: use do..while(0) form for macro. 2012-02-02 14:31:17 +01:00
af_amerge.c lavfi/amerge: copy ref props after filtering samples. 2012-02-02 14:31:18 +01:00
af_anull.c
af_aresample.c lavfi/aresample: use libswresample. 2012-02-02 14:31:17 +01:00
af_ashowinfo.c lavfi/ashowinfo: only print checksum for the existing planes 2012-02-14 18:01:57 +01:00
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_pan: move query_format before config_props. 2012-02-20 23:36:03 +01:00
af_silencedetect.c lavfi/silencedetect: use av_ts2timestr() macro. 2012-02-15 00:22:47 +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 setfield filter 2012-02-06 20:46:58 +01:00
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 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 avfilter: add some asserts() to check refcounts. 2012-01-22 19:30:40 +01:00
avfilter.h Merge remote-tracking branch 'qatar/master' 2012-01-13 01:29:48 +01:00
avfiltergraph.c
avfiltergraph.h lavfi: add avfilter_graph_dump. 2012-01-24 11:38:36 +01:00
buffersink.h
buffersrc.h lavfi: add a new function av_buffersrc_buffer(). 2011-12-25 16:18:57 +01:00
defaults.c Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
drawutils.c
drawutils.h
formats.c Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
gradfun.h
graphdump.c lavfi: add avfilter_graph_dump. 2012-01-24 11:38:36 +01:00
graphparser.c
internal.h avfilter: pool draining and self destruction support. 2012-01-12 16:32:54 +01:00
libavfilter.v
Makefile lavfi: add setfield filter 2012-02-06 20:46:58 +01:00
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
version.h lavfi/overlay: add logic for avoiding overlaying frames with PTS > main frame PTS 2012-02-17 00:28:35 +01:00
vf_aspect.c lavfi/aspect: set default value to 0:1, as stated in the docs 2012-02-18 11:41:53 +01:00
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 deshake: variable used uninitialized 2012-01-21 05:22:49 +01:00
vf_drawbox.c
vf_drawtext.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
vf_fade.c lavfi: add missing periods in descriptions. 2012-01-20 00:16:27 +01:00
vf_fieldorder.c
vf_fifo.c
vf_format.c Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
vf_frei0r.c
vf_gradfun.c Merge remote-tracking branch 'qatar/master' 2012-02-14 01:53:31 +01:00
vf_hflip.c Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
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 lavfi: fix mp and mandelbrot descriptions to make them complete sentences 2012-01-21 14:40:46 +01:00
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 Merge remote-tracking branch 'qatar/master' 2012-02-09 01:27:12 +01:00
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 lavfi: add setfield filter 2012-02-06 20:46:58 +01:00
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 lavfi/showinfo: only print checksum for the existing planes 2012-02-14 18:01:50 +01:00
vf_slicify.c
vf_split.c
vf_thumbnail.c lavfi/thumbnail: rename @url to @see. 2012-02-03 00:55:37 +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' 2012-02-14 01:53:31 +01:00
vsink_nullsink.c
vsrc_buffer.c Merge remote-tracking branch 'qatar/master' 2012-01-13 01:29:48 +01:00
vsrc_buffer.h
vsrc_cellauto.c
vsrc_color.c lavfi: add missing periods in descriptions. 2012-01-20 00:16:27 +01:00
vsrc_life.c
vsrc_mandelbrot.c lavfi: fix mp and mandelbrot descriptions to make them complete sentences 2012-01-21 14:40:46 +01:00
vsrc_mptestsrc.c
vsrc_testsrc.c lavfi/testsrc: add "decimals" option to the testsrc filter 2012-01-17 12:03:30 +01:00
yadif.h