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_overlay.c | |
parent | 9023de342f88e961a3741753aff68925eebf884e (diff) | |
parent | df53a4a7c1c496363e3fc165b431940ccd0cb8a0 (diff) | |
download | ffmpeg-streaming-88beb2df982aa4de257f742ff41f777927cc5173.zip ffmpeg-streaming-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_overlay.c')
-rw-r--r-- | libavfilter/vf_overlay.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index 57cef6f..935274f 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -145,8 +145,7 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&over->x_expr); av_freep(&over->y_expr); - if (over->overpicref) - avfilter_unref_bufferp(&over->overpicref); + avfilter_unref_bufferp(&over->overpicref); ff_bufqueue_discard_all(&over->queue_main); ff_bufqueue_discard_all(&over->queue_over); } @@ -506,7 +505,7 @@ static void flush_frames(AVFilterContext *ctx) while (!try_push_frame(ctx)); } -static void start_frame_main(AVFilterLink *inlink, AVFilterBufferRef *inpicref) +static int start_frame_main(AVFilterLink *inlink, AVFilterBufferRef *inpicref) { AVFilterContext *ctx = inlink->dst; OverlayContext *over = ctx->priv; @@ -519,9 +518,10 @@ static void start_frame_main(AVFilterLink *inlink, AVFilterBufferRef *inpicref) av_assert1(inpicref == inlink->cur_buf); inlink->cur_buf = NULL; } + return 0; } -static void draw_slice_main(AVFilterLink *inlink, int y, int h, int slice_dir) +static int draw_slice_main(AVFilterLink *inlink, int y, int h, int slice_dir) { AVFilterContext *ctx = inlink->dst; OverlayContext *over = ctx->priv; @@ -536,10 +536,10 @@ static void draw_slice_main(AVFilterLink *inlink, int y, int h, int slice_dir) over->overpicref->video->w, over->overpicref->video->h, y, outpicref->video->w, h); } - ff_draw_slice(outlink, y, h, slice_dir); + return ff_draw_slice(outlink, y, h, slice_dir); } -static void end_frame_main(AVFilterLink *inlink) +static int end_frame_main(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; AVFilterLink *outlink = ctx->outputs[0]; @@ -547,15 +547,16 @@ static void end_frame_main(AVFilterLink *inlink) flush_frames(ctx); if (!outpicref) - return; - ff_end_frame(ctx->outputs[0]); + return 0; + return ff_end_frame(ctx->outputs[0]); } -static void start_frame_over(AVFilterLink *inlink, AVFilterBufferRef *inpicref) +static int start_frame_over(AVFilterLink *inlink, AVFilterBufferRef *inpicref) { + return 0; } -static void end_frame_over(AVFilterLink *inlink) +static int end_frame_over(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; OverlayContext *over = ctx->priv; @@ -566,7 +567,7 @@ static void end_frame_over(AVFilterLink *inlink) inpicref->pts = av_rescale_q(inpicref->pts, ctx->inputs[OVERLAY]->time_base, ctx->outputs[0]->time_base); ff_bufqueue_add(ctx, &over->queue_over, inpicref); - try_push_frame(ctx); + return try_push_frame(ctx); } static int request_frame(AVFilterLink *outlink) @@ -597,7 +598,10 @@ static int request_frame(AVFilterLink *outlink) return 0; } -static void null_draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) { } +static int null_draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) +{ + return 0; +} AVFilter avfilter_vf_overlay = { .name = "overlay", |