diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-22 22:57:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-22 23:56:21 +0200 |
| commit | 88beb2df982aa4de257f742ff41f777927cc5173 (patch) | |
| tree | 15427851afeaa2fee531f53808237948b81b2e44 /libavfilter/vf_removelogo.c | |
| parent | 9023de342f88e961a3741753aff68925eebf884e (diff) | |
| parent | df53a4a7c1c496363e3fc165b431940ccd0cb8a0 (diff) | |
| download | ffmpeg-88beb2df982aa4de257f742ff41f777927cc5173.tar.gz | |
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>
Diffstat (limited to 'libavfilter/vf_removelogo.c')
| -rw-r--r-- | libavfilter/vf_removelogo.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavfilter/vf_removelogo.c b/libavfilter/vf_removelogo.c index df67193fd3..7b0a662b92 100644 --- a/libavfilter/vf_removelogo.c +++ b/libavfilter/vf_removelogo.c @@ -472,7 +472,7 @@ static void blur_image(int ***mask, } } -static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *inpicref) +static int start_frame(AVFilterLink *inlink, AVFilterBufferRef *inpicref) { AVFilterLink *outlink = inlink->dst->outputs[0]; AVFilterBufferRef *outpicref; @@ -487,10 +487,10 @@ static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *inpicref) outpicref = inpicref; outlink->out_buf = outpicref; - ff_start_frame(outlink, avfilter_ref_buffer(outpicref, ~0)); + return ff_start_frame(outlink, avfilter_ref_buffer(outpicref, ~0)); } -static void end_frame(AVFilterLink *inlink) +static int end_frame(AVFilterLink *inlink) { RemovelogoContext *removelogo = inlink->dst->priv; AVFilterLink *outlink = inlink->dst->outputs[0]; @@ -515,7 +515,7 @@ static void end_frame(AVFilterLink *inlink) inlink->w/2, inlink->h/2, direct, &removelogo->half_mask_bbox); ff_draw_slice(outlink, 0, inlink->h, 1); - ff_end_frame(outlink); + return ff_end_frame(outlink); } static void uninit(AVFilterContext *ctx) @@ -540,7 +540,7 @@ static void uninit(AVFilterContext *ctx) } } -static void null_draw_slice(AVFilterLink *link, int y, int h, int slice_dir) { } +static int null_draw_slice(AVFilterLink *link, int y, int h, int slice_dir) { return 0; } AVFilter avfilter_vf_removelogo = { .name = "removelogo", |