From ae2abc69db54552dd6b687ad170ce3cb57882617 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Tue, 3 Nov 2009 22:04:55 +0000 Subject: [PATCH] Explicitely define get_video_buffer() callbacks in the format, noformat and null filters. Originally committed as revision 20443 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavfilter/vf_format.c | 8 ++++++++ libavfilter/vf_null.c | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c index d80762b069..97814c0a87 100644 --- a/libavfilter/vf_format.c +++ b/libavfilter/vf_format.c @@ -96,6 +96,12 @@ static int query_formats_noformat(AVFilterContext *ctx) return 0; } +static AVFilterPicRef *get_video_buffer(AVFilterLink *link, int perms, + int w, int h) +{ + return avfilter_get_video_buffer(link->dst->outputs[0], perms, w, h); +} + static void start_frame(AVFilterLink *link, AVFilterPicRef *picref) { avfilter_start_frame(link->dst->outputs[0], picref); @@ -123,6 +129,7 @@ AVFilter avfilter_vf_format = { .inputs = (AVFilterPad[]) {{ .name = "default", .type = CODEC_TYPE_VIDEO, + .get_video_buffer= get_video_buffer, .start_frame = start_frame, .draw_slice = draw_slice, .end_frame = end_frame, }, @@ -144,6 +151,7 @@ AVFilter avfilter_vf_noformat = { .inputs = (AVFilterPad[]) {{ .name = "default", .type = CODEC_TYPE_VIDEO, + .get_video_buffer= get_video_buffer, .start_frame = start_frame, .draw_slice = draw_slice, .end_frame = end_frame, }, diff --git a/libavfilter/vf_null.c b/libavfilter/vf_null.c index 3724ac7d68..582708ce0c 100644 --- a/libavfilter/vf_null.c +++ b/libavfilter/vf_null.c @@ -23,6 +23,12 @@ #include "avfilter.h" +static AVFilterPicRef *get_video_buffer(AVFilterLink *link, int perms, + int w, int h) +{ + return avfilter_get_video_buffer(link->dst->outputs[0], perms, w, h); +} + static void start_frame(AVFilterLink *link, AVFilterPicRef *picref) { avfilter_start_frame(link->dst->outputs[0], picref); @@ -41,6 +47,7 @@ AVFilter avfilter_vf_null = { .inputs = (AVFilterPad[]) {{ .name = "default", .type = CODEC_TYPE_VIDEO, + .get_video_buffer = get_video_buffer, .start_frame = start_frame, .end_frame = end_frame }, { .name = NULL}},