[FFmpeg-cvslog] lavfi/avf_showspectrum: remove looping on request_frame().
Nicolas George
git at videolan.org
Wed Oct 7 19:08:34 CEST 2015
ffmpeg | branch: master | Nicolas George <george at nsup.org> | Fri Oct 2 16:03:02 2015 +0200| [9a520c4d52a2d851b54490ee9e2e8b2a10b0def1] | committer: Nicolas George
lavfi/avf_showspectrum: remove looping on request_frame().
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9a520c4d52a2d851b54490ee9e2e8b2a10b0def1
---
libavfilter/avf_showspectrum.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c
index e29687d..53ba940 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;
More information about the ffmpeg-cvslog
mailing list