1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
FFmpeg/libavfilter
Michael Niedermayer 8c6ebab747 Merge remote-tracking branch 'qatar/master'
* qatar/master: (26 commits)
  eac3dec: replace undefined 1<<31 with INT32_MIN in noise generation
  yadif: specify array size outside DECLARE_ALIGNED
  prores: specify array size outside DECLARE_ALIGNED brackets.
  WavPack demuxer: set packet duration
  tta: use skip_bits_long()
  mxfdec: Ignore the last entry in Avid's index table segments
  mxfdec: Sanity-check SampleRate
  mxfdec: Handle small EditUnitByteCount
  mxfdec: Consider OPAtom files that do not have exactly one EC to be OP1a
  mxfdec: Don't crash in mxf_packet_timestamps() if current_edit_unit overflows
  mxfdec: Zero nb_ptses in mxf_compute_ptses_fake_index()
  mxfdec: Sanity check PreviousPartition
  mxfdec: Never seek back in local sets and KLVs
  mxfdec: Move the current_partition check inside mxf_read_header()
  mxfdec: Fix infinite loop in mxf_packet_timestamps()
  mxfdec: Check eof_reached in mxf_read_local_tags()
  mxfdec: Check for NULL component
  mxfdec: Make sure mxf->nb_index_tables > 0 in mxf_packet_timestamps()
  mxfdec: Make sure x < index_table->nb_ptses
  build: Add missing directories to DIRS declarations.
  ...

Conflicts:
	doc/build_system.txt
	doc/fate.texi
	libavfilter/x86/yadif_template.c
	libavformat/mxfdec.c
	libavutil/Makefile
	tests/fate/audio.mak
	tests/fate/prores.mak
	tests/fate/screen.mak
	tests/fate/video.mak
	tests/ref/fate/bethsoft-vid
	tests/ref/fate/cscd
	tests/ref/fate/dfa4
	tests/ref/fate/nuv
	tests/ref/fate/vp8-sign-bias
	tests/ref/fate/wmv8-drm
	tests/ref/lavf/gxf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-10 01:20:07 +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
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/pan: copy ref props after filtering samples. 2012-02-02 14:31:18 +01:00
af_silencedetect.c lavfi: add audio silencedetect filter. 2012-01-08 17:08:55 +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 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 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 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 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: add setfield filter 2012-02-06 20:46:58 +01:00
vf_aspect.c lavfi/aspect: rename field aspect->aspect to aspect->ratio 2012-02-07 15:49:01 +01:00
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 Merge remote-tracking branch 'qatar/master' 2012-02-09 01:27:12 +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-07 01:40:29 +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 Fix various if parenthesis misplacements. 2011-11-21 19:35:33 +01:00
vf_format.c Merge remote-tracking branch 'qatar/master' 2012-01-29 00:34:59 +01:00
vf_frei0r.c
vf_gradfun.c
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
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 overlay: do not leak x/y expressions. 2012-01-15 09:12:03 +01:00
vf_pad.c
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-09 01:27:12 +01:00
vf_select.c
vf_setfield.c lavfi: add setfield filter 2012-02-06 20:46:58 +01:00
vf_setpts.c
vf_settb.c
vf_showinfo.c
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 lavfi: add missing periods in descriptions. 2012-01-20 00:16:27 +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 lavfi: add cellauto source 2011-12-11 11:55:33 +01:00
vsrc_color.c lavfi: add missing periods in descriptions. 2012-01-20 00:16:27 +01:00
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 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