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_alphamerge.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_alphamerge.c')
| -rw-r--r-- | libavfilter/vf_alphamerge.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavfilter/vf_alphamerge.c b/libavfilter/vf_alphamerge.c index 67422a1df1..278f9a3e03 100644 --- a/libavfilter/vf_alphamerge.c +++ b/libavfilter/vf_alphamerge.c @@ -95,8 +95,8 @@ static int config_output(AVFilterLink *outlink) return 0; } -static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref) {} -static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) {} +static int start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref) {return 0;} +static int draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) {return 0;} static void draw_frame(AVFilterContext *ctx, AVFilterBufferRef *main_buf, @@ -130,7 +130,7 @@ static void draw_frame(AVFilterContext *ctx, ff_draw_slice(ctx->outputs[0], 0, h, 1); } -static void end_frame(AVFilterLink *inlink) +static int end_frame(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; AlphaMergeContext *merge = ctx->priv; @@ -157,6 +157,7 @@ static void end_frame(AVFilterLink *inlink) ff_end_frame(ctx->outputs[0]); avfilter_unref_buffer(alpha_buf); } + return 0; } static int request_frame(AVFilterLink *outlink) |