Merge commit '6a27ae28f9bde981e85c82cf5bf42c5f43fb6f13'

[ffmpeg] / libavfilter / vsink_nullsink.c

diff --git a/libavfilter/vsink_nullsink.c b/libavfilter/vsink_nullsink.c
index 89bf29ae5604579cc7827240864843f14a99b8b0..a37d346eed12b0b31444a6b4c9702709fd17b321 100644 (file)
--- a/libavfilter/vsink_nullsink.c
+++ b/libavfilter/vsink_nullsink.c
@@ -20,13 +20,9 @@
 #include "internal.h"
 #include "libavutil/internal.h"
 
-static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
-{
-    return 0;
-}
-
-static int end_frame(AVFilterLink *link)
+static int filter_frame(AVFilterLink *link, AVFilterBufferRef *frame)
 {
+    avfilter_unref_bufferp(&frame);
     return 0;
 }
 
@@ -34,8 +30,7 @@ static const AVFilterPad avfilter_vsink_nullsink_inputs[] = {
     {
         .name        = "default",
         .type        = AVMEDIA_TYPE_VIDEO,
-        .start_frame = start_frame,
-        .end_frame   = end_frame,
+        .filter_frame = filter_frame,
     },
     { NULL },
 };