From 3d1e2ada2574f89d8475ea9b0249ec861a888edf Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Sat, 15 Dec 2012 13:44:06 +0100 Subject: [PATCH] lavfi/overlay: remove duplicated definition of ff_null_get_video_buffer() Simplify. --- libavfilter/vf_overlay.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index d61d18e1bb..01a829c828 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -284,11 +284,6 @@ static int config_output(AVFilterLink *outlink) return 0; } -static AVFilterBufferRef *get_video_buffer(AVFilterLink *link, int perms, int w, int h) -{ - return ff_get_video_buffer(link->dst->outputs[0], perms, w, h); -} - // divide by 255 and round to nearest // apply a fast variant: (X+127)/255 = ((X+127)*257+257)>>16 = ((X+128)*257)>>16 #define FAST_DIV255(x) ((((x) + 128) * 257) >> 16) @@ -661,7 +656,7 @@ static const AVFilterPad avfilter_vf_overlay_inputs[] = { { .name = "main", .type = AVMEDIA_TYPE_VIDEO, - .get_video_buffer= get_video_buffer, + .get_video_buffer = ff_null_get_video_buffer, .config_props = config_input_main, .start_frame = start_frame_main, .draw_slice = draw_slice_main,