angler-fishThe Vulnerability History Project

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

      * commit '7e350379f87e7f74420b4813170fe808e2313911':
  lavfi: switch to AVFrame.

Conflicts:
	doc/filters.texi
	libavfilter/af_ashowinfo.c
	libavfilter/audio.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/buffersink.c
	libavfilter/buffersrc.c
	libavfilter/buffersrc.h
	libavfilter/f_select.c
	libavfilter/f_setpts.c
	libavfilter/fifo.c
	libavfilter/split.c
	libavfilter/src_movie.c
	libavfilter/version.h
	libavfilter/vf_aspect.c
	libavfilter/vf_bbox.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_delogo.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_fieldorder.c
	libavfilter/vf_fps.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_gradfun.c
	libavfilter/vf_hqdn3d.c
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_showinfo.c
	libavfilter/vf_transpose.c
	libavfilter/vf_vflip.c
	libavfilter/vf_yadif.c
	libavfilter/video.c
by Nelson the Hummingbird 2013-03-10 00:30:30 UTC
commit a05a44e205d6ae13d5eb1cd8d4ad2dba6ec940b3
FFmpeg
doc/filters.texi
+3
ffmpeg.c
+3 -3
libavfilter/Makefile
+2
libavfilter/af_aconvert.c
+10 -9
libavfilter/af_afade.c
+8 -8
libavfilter/af_amerge.c
+14 -14
libavfilter/af_amix.c
+9 -9
libavfilter/af_apad.c
+8 -8
libavfilter/af_aresample.c
+17 -16
libavfilter/af_asetnsamples.c
+12 -12
libavfilter/af_ashowinfo.c
+8 -7
libavfilter/af_astreamsync.c
+7 -5
libavfilter/af_asyncts.c
+12 -10
libavfilter/af_atempo.c
+17 -11
libavfilter/af_biquads.c
+7 -7
libavfilter/af_channelmap.c
+2 -2
libavfilter/af_channelsplit.c
+5 -5
libavfilter/af_earwax.c
+9 -8
libavfilter/af_join.c
+70 -81
libavfilter/af_pan.c
+8 -7
libavfilter/af_resample.c
+30 -28
libavfilter/af_silencedetect.c
+4 -4
libavfilter/af_volume.c
+6 -6
libavfilter/af_volumedetect.c
+4 -3
libavfilter/allfilters.c
+2 -2
libavfilter/asink_anullsink.c
+2 -2
libavfilter/asrc_aevalsrc.c
+4 -3
libavfilter/asrc_anullsrc.c
+8 -6
libavfilter/asrc_flite.c
+4 -4
libavfilter/audio.c
+38 -41
libavfilter/audio.h
+7 -3
libavfilter/avcodec.c
+46
libavfilter/avcodec.h
+28
libavfilter/avf_concat.c
+14 -11
libavfilter/avf_showspectrum.c
+13 -11
libavfilter/avf_showwaves.c
+12 -10
libavfilter/avfilter.c
+83 -55
libavfilter/avfilter.h
+7 -41
libavfilter/buffer.c
+109 -31
libavfilter/bufferqueue.h
+10 -12
libavfilter/buffersink.c
+28 -108
libavfilter/buffersink.h
-34
libavfilter/buffersrc.c
+90 -192
libavfilter/buffersrc.h
+5 -37
libavfilter/f_ebur128.c
+12 -11
libavfilter/f_select.c
+30 -29
libavfilter/f_sendcmd.c
+1 -1
libavfilter/f_setpts.c
+5 -5
libavfilter/f_settb.c
+1 -1
libavfilter/fifo.c
+58 -55
libavfilter/internal.h
+28 -5
libavfilter/sink_buffer.c
+105 -111
libavfilter/split.c
+4 -4
libavfilter/src_buffer.c
+123
libavfilter/src_movie.c
+54 -26
libavfilter/version.h
-3
libavfilter/vf_alphaextract.c
+6 -4
libavfilter/vf_alphamerge.c
+8 -8
libavfilter/vf_aspect.c
+2 -2
libavfilter/vf_bbox.c
+4 -4
libavfilter/vf_blackdetect.c
+4 -4
libavfilter/vf_blackframe.c
+6 -6
libavfilter/vf_blend.c
+16 -13
libavfilter/vf_boxblur.c
+9 -8
libavfilter/vf_colormatrix.c
+16 -15
libavfilter/vf_copy.c
+1 -19
libavfilter/vf_crop.c
+6 -3
libavfilter/vf_cropdetect.c
+11 -11
libavfilter/vf_decimate.c
+9 -8
libavfilter/vf_delogo.c
+8 -8
libavfilter/vf_deshake.c
+8 -8
libavfilter/vf_drawbox.c
+5 -5
libavfilter/vf_drawtext.c
+11 -10
libavfilter/vf_edgedetect.c
+7 -6
libavfilter/vf_fade.c
+5 -5
libavfilter/vf_field.c
+3 -3
libavfilter/vf_fieldorder.c
+9 -9
libavfilter/vf_fps.c
+17 -17
libavfilter/vf_framestep.c
+2 -2
libavfilter/vf_frei0r.c
+15 -13
libavfilter/vf_geq.c
+11 -10
libavfilter/vf_gradfun.c
+8 -7
libavfilter/vf_hflip.c
+8 -7
libavfilter/vf_histeq.c
+7 -6
libavfilter/vf_histogram.c
+9 -7
libavfilter/vf_hqdn3d.c
+9 -10
libavfilter/vf_hue.c
+7 -6
libavfilter/vf_idet.c
+17 -17
libavfilter/vf_il.c
+6 -6
libavfilter/vf_kerndeint.c
+8 -7
libavfilter/vf_libopencv.c
+17 -16
libavfilter/vf_lut.c
+9 -9
libavfilter/vf_mp.c
+31 -20
libavfilter/vf_noise.c
+7 -7
libavfilter/vf_overlay.c
+15 -14
libavfilter/vf_pad.c
+63 -95
libavfilter/vf_pixdesctest.c
+8 -6
libavfilter/vf_pp.c
+10 -9
libavfilter/vf_removelogo.c
+8 -7
libavfilter/vf_scale.c
+19 -18
libavfilter/vf_setfield.c
+4 -4
libavfilter/vf_showinfo.c
+10 -9
libavfilter/vf_smartblur.c
+6 -6
libavfilter/vf_stereo3d.c
+10 -6
libavfilter/vf_subtitles.c
+4 -4
libavfilter/vf_super2xsai.c
+8 -7
libavfilter/vf_swapuv.c
+11 -13
libavfilter/vf_thumbnail.c
+6 -5
libavfilter/vf_tile.c
+11 -9
libavfilter/vf_tinterlace.c
+29 -29
libavfilter/vf_transpose.c
+16 -15
libavfilter/vf_unsharp.c
+7 -6
libavfilter/vf_vflip.c
+13 -9
libavfilter/vf_yadif.c
+26 -23
libavfilter/video.c
+32 -29
libavfilter/video.h
+6 -3
libavfilter/vsink_nullsink.c
+2 -2
libavfilter/vsrc_cellauto.c
+5 -3
libavfilter/vsrc_life.c
+6 -5
libavfilter/vsrc_mandelbrot.c
+3 -2
libavfilter/vsrc_mptestsrc.c
+2 -2
libavfilter/vsrc_testsrc.c
+34 -32
libavfilter/yadif.h
+4 -4
libavutil/frame.c
-1
expand_less