Merge commit '998fdcff41bbda8ef13c991743376556f910efa9'

[ffmpeg] / libavfilter / buffersink.c

diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c
index 1e3cf50ef6161f88caf0eabad1999d09f51ddc7b..282be30071fc03b286976f716c5cfe6ebe52c044 100644 (file)
--- a/libavfilter/buffersink.c
+++ b/libavfilter/buffersink.c
@@ -48,13 +48,12 @@ static av_cold void uninit(AVFilterContext *ctx)
         av_audio_fifo_free(sink->audio_fifo);
 }
 
-static int start_frame(AVFilterLink *link, AVFilterBufferRef *buf)
+static int filter_frame(AVFilterLink *link, AVFilterBufferRef *buf)
 {
     BufferSinkContext *s = link->dst->priv;
 
 //     av_assert0(!s->cur_buf);
     s->cur_buf    = buf;
-    link->cur_buf = NULL;
 
     return 0;
 }
@@ -144,7 +143,7 @@ static const AVFilterPad avfilter_vsink_buffer_inputs[] = {
     {
         .name        = "default",
         .type        = AVMEDIA_TYPE_VIDEO,
-        .start_frame = start_frame,
+        .filter_frame = filter_frame,
         .min_perms   = AV_PERM_READ,
         .needs_fifo  = 1
     },
@@ -169,7 +168,7 @@ static const AVFilterPad avfilter_asink_abuffer_inputs[] = {
     {
         .name           = "default",
         .type           = AVMEDIA_TYPE_AUDIO,
-        .filter_samples = start_frame,
+        .filter_frame   = filter_frame,
         .min_perms      = AV_PERM_READ,
         .needs_fifo     = 1
     },