diff options
| author | Nicolas George <george@nsup.org> | 2015-10-02 16:03:02 +0200 |
|---|---|---|
| committer | Nicolas George <george@nsup.org> | 2015-10-07 19:00:22 +0200 |
| commit | 9a520c4d52a2d851b54490ee9e2e8b2a10b0def1 (patch) | |
| tree | 7c843101466380abddccd4271d5f7c2ad5660d2a | |
| parent | 114f3f526e5ad1557c514fe1213dd87f4ebe6f6a (diff) | |
| download | ffmpeg-9a520c4d52a2d851b54490ee9e2e8b2a10b0def1.tar.gz | |
lavfi/avf_showspectrum: remove looping on request_frame().
| -rw-r--r-- | libavfilter/avf_showspectrum.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index e29687d8ba..53ba940c71 100644 --- a/libavfilter/avf_showspectrum.c +++ b/libavfilter/avf_showspectrum.c @@ -44,7 +44,6 @@ typedef struct { const AVClass *class; int w, h; AVFrame *outpicref; - int req_fullfilled; int nb_display_channels; int channel_height; int sliding; ///< 1 if sliding mode, 0 otherwise @@ -268,8 +267,7 @@ static int request_frame(AVFilterLink *outlink) unsigned i; int ret; - s->req_fullfilled = 0; - do { + /* TODO reindent */ ret = ff_request_frame(inlink); if (ret == AVERROR_EOF && s->sliding == FULLFRAME && s->xpos > 0 && s->outpicref) { @@ -280,9 +278,7 @@ static int request_frame(AVFilterLink *outlink) } ret = ff_filter_frame(outlink, s->outpicref); s->outpicref = NULL; - s->req_fullfilled = 1; } - } while (!s->req_fullfilled && ret >= 0); return ret; } @@ -468,7 +464,6 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFrame *insamples) if (s->xpos >= outlink->w) s->xpos = 0; if (s->sliding != FULLFRAME || s->xpos == 0) { - s->req_fullfilled = 1; ret = ff_filter_frame(outlink, av_frame_clone(s->outpicref)); if (ret < 0) return ret; |