virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

lavfi/af_aresample: remove looping on request_frame().

Browse Source
This commit is contained in:
Nicolas George
2015-10-02 15:54:55 +02:00
parent 1bc873acd6
commit 4982130d5a
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavfilter/af_aresample.c
View File

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