RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/libavfilter
History
Michael Niedermayer 88beb2df98 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  FATE: fix the asyncts test
  build: Drop gcc-specific warning flag from header compilation rule
  FATE: add a test for the asyncts audio filter.
  matroskadec: return more correct error code on read error.
  buffersrc: check ff_get_audio_buffer() for errors.
  lavfi: check all ff_get_video_buffer() calls for errors.
  lavfi: check all avfilter_ref_buffer() calls for errors.
  vf_select: avoid an unnecessary avfilter_ref_buffer().
  buffersrc: avoid creating unnecessary buffer reference
  lavfi: use avfilter_unref_bufferp() where appropriate.
  vf_fps: add more error checks.
  vf_fps: fix a memleak on malloc failure.
  lavfi: check all ff_start_frame/draw_slice/end_frame calls for errors
  lavfi: add error handling to end_frame().
  lavfi: add error handling to draw_slice().
  lavfi: add error handling to start_frame().

Conflicts:
	Makefile
	ffplay.c
	libavfilter/buffersrc.c
	libavfilter/vf_boxblur.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_hflip.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/video.c
	libavfilter/vsrc_color.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2012-07-22 23:56:21 +02:00
..
libmpcodecs
…
x86
…
Makefile
…
af_aconvert.c
…
af_aformat.c
…
af_amerge.c
…
af_amix.c
…
af_anull.c
…
af_aresample.c
…
af_asetnsamples.c
…
af_ashowinfo.c
…
af_astreamsync.c
…
af_asyncts.c
…
af_atempo.c
…
af_channelmap.c
…
af_channelsplit.c
…
af_earwax.c
…
af_join.c
…
af_pan.c
…
af_resample.c
…
af_silencedetect.c
…
af_volume.c
…
all_channel_layouts.inc
…
allfilters.c
…
asink_anullsink.c
…
asrc_abuffer.h
…
asrc_aevalsrc.c
…
asrc_anullsrc.c
…
audio.c
…
audio.h
…
avcodec.c
…
avcodec.h
…
avf_showwaves.c
…
avfilter.c
…
avfilter.h Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
avfiltergraph.c
…
avfiltergraph.h
…
bbox.c
…
bbox.h
…
buffer.c
…
bufferqueue.h
…
buffersink.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
buffersink.h
…
buffersrc.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
buffersrc.h
…
defaults.c
…
drawutils.c
…
drawutils.h
…
f_settb.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
fifo.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
filtfmts.c
…
formats.c
…
formats.h
…
gradfun.h
…
graphdump.c
…
graphparser.c
…
internal.h Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
lavfutils.c
…
lavfutils.h
…
libavfilter.v
…
lswsutils.c
…
lswsutils.h
…
sink_buffer.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
split.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
src_buffer.c
…
src_movie.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
transform.c
…
transform.h
…
version.h
…
vf_alphaextract.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_alphamerge.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_aspect.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_ass.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_bbox.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_blackdetect.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_blackframe.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_boxblur.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_colormatrix.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_copy.c
…
vf_crop.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_cropdetect.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_delogo.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_deshake.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_drawbox.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_drawtext.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_fade.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_fieldorder.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_format.c
…
vf_fps.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_frei0r.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_gradfun.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_hflip.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_hqdn3d.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_idet.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_libopencv.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_lut.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_mp.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_null.c
…
vf_overlay.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_pad.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_pixdesctest.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_removelogo.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_scale.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_select.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_setfield.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_setpts.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_showinfo.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_slicify.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_super2xsai.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_swapuv.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_thumbnail.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_tile.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_tinterlace.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_transpose.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_unsharp.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_vflip.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vf_yadif.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
video.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
video.h Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vsink_nullsink.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vsrc_cellauto.c
…
vsrc_color.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
vsrc_life.c
…
vsrc_mandelbrot.c
…
vsrc_mptestsrc.c
…
vsrc_testsrc.c Merge remote-tracking branch 'qatar/master' 2012-07-22 23:56:21 +02:00
yadif.h
…