diff options
| author | Nicolas George <george@nsup.org> | 2015-10-02 16:03:16 +0200 |
|---|---|---|
| committer | Nicolas George <george@nsup.org> | 2015-10-07 19:05:13 +0200 |
| commit | 35c3043ea4e67f07ada1e45aaf7b5af2c88c352c (patch) | |
| tree | b1f2dc1ad9695651a4abbde36643b730cb89fc0c /libavfilter/avf_showspectrum.c | |
| parent | 4883e5d54012e76d47d6781b2178de53afdea8f6 (diff) | |
| download | ffmpeg-streaming-35c3043ea4e67f07ada1e45aaf7b5af2c88c352c.zip ffmpeg-streaming-35c3043ea4e67f07ada1e45aaf7b5af2c88c352c.tar.gz | |
lavfi/avf_showspectrum: reindent after last commit.
Diffstat (limited to 'libavfilter/avf_showspectrum.c')
| -rw-r--r-- | libavfilter/avf_showspectrum.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index 53ba940..11c3246 100644 --- a/libavfilter/avf_showspectrum.c +++ b/libavfilter/avf_showspectrum.c @@ -267,18 +267,17 @@ static int request_frame(AVFilterLink *outlink) unsigned i; int ret; - /* TODO reindent */ - ret = ff_request_frame(inlink); - if (ret == AVERROR_EOF && s->sliding == FULLFRAME && s->xpos > 0 && - s->outpicref) { - for (i = 0; i < outlink->h; i++) { - memset(s->outpicref->data[0] + i * s->outpicref->linesize[0] + s->xpos, 0, outlink->w - s->xpos); - memset(s->outpicref->data[1] + i * s->outpicref->linesize[1] + s->xpos, 128, outlink->w - s->xpos); - memset(s->outpicref->data[2] + i * s->outpicref->linesize[2] + s->xpos, 128, outlink->w - s->xpos); - } - ret = ff_filter_frame(outlink, s->outpicref); - s->outpicref = NULL; + ret = ff_request_frame(inlink); + if (ret == AVERROR_EOF && s->sliding == FULLFRAME && s->xpos > 0 && + s->outpicref) { + for (i = 0; i < outlink->h; i++) { + memset(s->outpicref->data[0] + i * s->outpicref->linesize[0] + s->xpos, 0, outlink->w - s->xpos); + memset(s->outpicref->data[1] + i * s->outpicref->linesize[1] + s->xpos, 128, outlink->w - s->xpos); + memset(s->outpicref->data[2] + i * s->outpicref->linesize[2] + s->xpos, 128, outlink->w - s->xpos); } + ret = ff_filter_frame(outlink, s->outpicref); + s->outpicref = NULL; + } return ret; } |
