Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas George <george@nsup.org>2015-10-02 17:00:53 +0300
committerNicolas George <george@nsup.org>2015-10-07 20:00:22 +0300
commit114f3f526e5ad1557c514fe1213dd87f4ebe6f6a (patch)
treef6ab5db536cb6948cf16f83a14a7d69a8cd286d0 /libavfilter/avf_showcqt.c
parent4982130d5a7babcb4b2e208fca2c745de7e10658 (diff)
lavfi/avf_showcqt: remove looping on request_frame().
Diffstat (limited to 'libavfilter/avf_showcqt.c')
-rw-r--r--libavfilter/avf_showcqt.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/libavfilter/avf_showcqt.c b/libavfilter/avf_showcqt.c
index 70897583a2..e939d8fb7a 100644
--- a/libavfilter/avf_showcqt.c
+++ b/libavfilter/avf_showcqt.c
@@ -75,7 +75,6 @@ typedef struct {
int spectogram_count;
int spectogram_index;
int fft_bits;
- int req_fullfilled;
int remaining_fill;
char *tlength;
char *volume;
@@ -423,7 +422,6 @@ static int config_output(AVFilterLink *outlink)
outlink->w = video_width;
outlink->h = video_height;
- s->req_fullfilled = 0;
s->spectogram_index = 0;
s->frame_count = 0;
s->spectogram_count = 0;
@@ -649,7 +647,6 @@ static int plot_cqt(AVFilterLink *inlink)
s->outpicref->pts = s->frame_count;
ret = ff_filter_frame(outlink, av_frame_clone(s->outpicref));
- s->req_fullfilled = 1;
s->frame_count++;
}
s->spectogram_count = (s->spectogram_count + 1) % s->count;
@@ -723,11 +720,7 @@ static int request_frame(AVFilterLink *outlink)
AVFilterLink *inlink = outlink->src->inputs[0];
int ret;
- s->req_fullfilled = 0;
- do {
- ret = ff_request_frame(inlink);
- } while (!s->req_fullfilled && ret >= 0);
-
+ ret = ff_request_frame(inlink);
if (ret == AVERROR_EOF && s->outpicref)
filter_frame(inlink, NULL);
return ret;