[FFmpeg-cvslog] lavfi/af_aresample: remove looping on request_frame().

Nicolas George git at videolan.org
Wed Oct 7 19:08:33 CEST 2015


ffmpeg | branch: master | Nicolas George <george at nsup.org> | Fri Oct  2 15:54:55 2015 +0200| [4982130d5a7babcb4b2e208fca2c745de7e10658] | committer: Nicolas George

lavfi/af_aresample: remove looping on request_frame().

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

 libavfilter/af_aresample.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c
index f6fdd08..b5af70e 100644
--- a/libavfilter/af_aresample.c
+++ b/libavfilter/af_aresample.c
@@ -40,7 +40,6 @@ typedef struct {
     double ratio;
     struct SwrContext *swr;
     int64_t next_pts;
-    int req_fullfilled;
     int more_data;
 } AResampleContext;
 
@@ -231,7 +230,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamplesref)
     outsamplesref->nb_samples  = n_out;
 
     ret = ff_filter_frame(outlink, outsamplesref);
-    aresample->req_fullfilled= 1;
     av_frame_free(&insamplesref);
     return ret;
 }
@@ -284,10 +282,7 @@ static int request_frame(AVFilterLink *outlink)
     aresample->more_data = 0;
 
     // Second request more data from the input
-    aresample->req_fullfilled = 0;
-    do{
-        ret = ff_request_frame(ctx->inputs[0]);
-    }while(!aresample->req_fullfilled && ret>=0);
+    ret = ff_request_frame(ctx->inputs[0]);
 
     // Third if we hit the end flush
     if (ret == AVERROR_EOF) {



More information about the ffmpeg-cvslog mailing list