[FFmpeg-cvslog] lavfi/vf_idet: remove the loop in request_frame().

Nicolas George git at videolan.org
Sun Sep 20 19:06:18 CEST 2015


ffmpeg | branch: master | Nicolas George <george at nsup.org> | Tue Aug 25 20:31:50 2015 +0200| [7635242ae591ec8c9e992f71a2db05b07eeaae3f] | committer: Nicolas George

lavfi/vf_idet: remove the loop in request_frame().

It is not necessary due to the use of FF_LINK_FLAG_REQUEST_LOOP.

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

 libavfilter/vf_idet.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/libavfilter/vf_idet.c b/libavfilter/vf_idet.c
index 711ba6e..d460330 100644
--- a/libavfilter/vf_idet.c
+++ b/libavfilter/vf_idet.c
@@ -314,7 +314,7 @@ static int request_frame(AVFilterLink *link)
     AVFilterContext *ctx = link->src;
     IDETContext *idet = ctx->priv;
 
-    do {
+    // TODO reindent
         int ret;
 
         if (idet->eof)
@@ -328,14 +328,11 @@ static int request_frame(AVFilterLink *link)
             if (!next)
                 return AVERROR(ENOMEM);
 
-            filter_frame(link->src->inputs[0], next);
+            ret = filter_frame(link->src->inputs[0], next);
             idet->eof = 1;
-        } else if (ret < 0) {
-            return ret;
         }
-    } while (link->frame_requested);
 
-    return 0;
+    return ret;
 }
 
 static av_cold void uninit(AVFilterContext *ctx)



More information about the ffmpeg-cvslog mailing list