virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

avfilter: Reindent

Browse Source
This commit is contained in:
Timothy Gu 2015-10-26 23:24:18 -07:00
parent 9b40ce5a45
commit 87d5509261
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavfilter/avfilter.c
View File

@ -347,20 +347,19 @@ int ff_request_frame(AVFilterLink *link)
if (link->closed) if (link->closed)
return AVERROR_EOF; return AVERROR_EOF;
// TODO reindent if (link->srcpad->request_frame)
if (link->srcpad->request_frame) ret = link->srcpad->request_frame(link);
ret = link->srcpad->request_frame(link); else if (link->src->inputs[0])
else if (link->src->inputs[0]) ret = ff_request_frame(link->src->inputs[0]);
ret = ff_request_frame(link->src->inputs[0]); if (ret == AVERROR_EOF && link->partial_buf) {
if (ret == AVERROR_EOF && link->partial_buf) { AVFrame *pbuf = link->partial_buf;
AVFrame *pbuf = link->partial_buf; link->partial_buf = NULL;
link->partial_buf = NULL; ret = ff_filter_frame_framed(link, pbuf);
ret = ff_filter_frame_framed(link, pbuf); }
} if (ret < 0) {
if (ret < 0) { if (ret == AVERROR_EOF)
if (ret == AVERROR_EOF) link->closed = 1;
link->closed = 1; }
}
return ret; return ret;
} }