summaryrefslogtreecommitdiff
path: root/libavfilter/af_aresample.c
diff options
context:
space:
mode:
authorNicolas George <george@nsup.org>2015-10-02 15:54:55 +0200
committerNicolas George <george@nsup.org>2015-10-07 19:00:22 +0200
commit4982130d5a7babcb4b2e208fca2c745de7e10658 (patch)
treeaa4907b5891a215d1dce1887735d168746b16943 /libavfilter/af_aresample.c
parent1bc873acd6e15eaca8c2aebfd7dc6472b0429c50 (diff)
lavfi/af_aresample: remove looping on request_frame().
Diffstat (limited to 'libavfilter/af_aresample.c')
-rw-r--r--libavfilter/af_aresample.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c
index f6fdd08a1a..b5af70e775 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) {