[FFmpeg-cvslog] buffersink: switch to filter_frame

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Nov 29 01:51:12 2012 +0100| [b5ecfa1d8d8d45f1f5924e192566c0a065b270a0] | committer: Michael Niedermayer

buffersink: switch to filter_frame

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b5ecfa1d8d8d45f1f5924e192566c0a065b270a0
---

 libavfilter/buffersink.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c
index cc3effb..282be30 100644
--- 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_frame   = start_frame,
+        .filter_frame   = filter_frame,
         .min_perms      = AV_PERM_READ,
         .needs_fifo     = 1
     },