diff options
| author | Nicolas George <george@nsup.org> | 2015-10-02 16:04:47 +0200 |
|---|---|---|
| committer | Nicolas George <george@nsup.org> | 2015-10-07 19:00:22 +0200 |
| commit | 8a2e2fc34aaeb0c092a9fd08d18bd5af7d240f1d (patch) | |
| tree | b5495255c24156b08fdf14e182e3570d139da247 /libavfilter/avf_showwaves.c | |
| parent | 9a520c4d52a2d851b54490ee9e2e8b2a10b0def1 (diff) | |
lavfi/avf_showwaves: remove looping on request_frame().
Diffstat (limited to 'libavfilter/avf_showwaves.c')
| -rw-r--r-- | libavfilter/avf_showwaves.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c index ec5291a405..b75c6666c8 100644 --- a/libavfilter/avf_showwaves.c +++ b/libavfilter/avf_showwaves.c @@ -53,7 +53,6 @@ typedef struct { int buf_idx; int16_t *buf_idy; /* y coordinate of previous sample for each channel */ AVFrame *outpicref; - int req_fullfilled; int n; int sample_count_mod; int mode; ///< ShowWavesMode @@ -179,8 +178,7 @@ inline static int push_frame(AVFilterLink *outlink) int nb_channels = inlink->channels; int ret, i; - if ((ret = ff_filter_frame(outlink, showwaves->outpicref)) >= 0) - showwaves->req_fullfilled = 1; + ret = ff_filter_frame(outlink, showwaves->outpicref); showwaves->outpicref = NULL; showwaves->buf_idx = 0; for (i = 0; i < nb_channels; i++) @@ -248,11 +246,7 @@ static int request_frame(AVFilterLink *outlink) AVFilterLink *inlink = outlink->src->inputs[0]; int ret; - showwaves->req_fullfilled = 0; - do { - ret = ff_request_frame(inlink); - } while (!showwaves->req_fullfilled && ret >= 0); - + ret = ff_request_frame(inlink); if (ret == AVERROR_EOF && showwaves->outpicref) { if (showwaves->single_pic) push_single_pic(outlink); |