Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavfilter / sink_buffer.c

diff --git a/libavfilter/sink_buffer.c b/libavfilter/sink_buffer.c
index 1c4996708a616e87e4e690b18d351ce62a6ea5b7..e5723854191eb2936bd8a0ddda4cec54ee3c65e9 100644 (file)
--- a/libavfilter/sink_buffer.c
+++ b/libavfilter/sink_buffer.c
@@ -140,6 +140,14 @@ int av_buffersink_get_buffer_ref(AVFilterContext *ctx,
     return 0;
 }
 
+int av_buffersink_poll_frame(AVFilterContext *ctx)
+{
+    BufferSinkContext *buf = ctx->priv;
+    AVFilterLink *inlink = ctx->inputs[0];
+
+    return av_fifo_size(buf->fifo)/sizeof(AVFilterBufferRef *) + avfilter_poll_frame(inlink);
+}
+
 #if FF_API_OLD_VSINK_API
 int av_vsink_buffer_get_video_buffer_ref(AVFilterContext *ctx,
                                          AVFilterBufferRef **picref, int flags)
@@ -188,12 +196,12 @@ AVFilter avfilter_vsink_buffersink = {
 
     .query_formats = vsink_query_formats,
 
-    .inputs    = (AVFilterPad[]) {{ .name          = "default",
+    .inputs    = (const AVFilterPad[]) {{ .name    = "default",
                                     .type          = AVMEDIA_TYPE_VIDEO,
                                     .end_frame     = end_frame,
                                     .min_perms     = AV_PERM_READ, },
                                   { .name = NULL }},
-    .outputs   = (AVFilterPad[]) {{ .name = NULL }},
+    .outputs   = (const AVFilterPad[]) {{ .name = NULL }},
 };
 
 #endif /* CONFIG_BUFFERSINK_FILTER */
@@ -252,12 +260,12 @@ AVFilter avfilter_asink_abuffersink = {
     .priv_size = sizeof(BufferSinkContext),
     .query_formats = asink_query_formats,
 
-    .inputs    = (AVFilterPad[]) {{ .name           = "default",
+    .inputs    = (const AVFilterPad[]) {{ .name     = "default",
                                     .type           = AVMEDIA_TYPE_AUDIO,
                                     .filter_samples = filter_samples,
                                     .min_perms      = AV_PERM_READ, },
                                   { .name = NULL }},
-    .outputs   = (AVFilterPad[]) {{ .name = NULL }},
+    .outputs   = (const AVFilterPad[]) {{ .name = NULL }},
 };
 
 #endif /* CONFIG_ABUFFERSINK_FILTER */