virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavfi/vf_alphamerge: reindent after last commit.

Browse Source
This commit is contained in:
Nicolas George 2015-10-02 16:12:51 +02:00
parent 35c3043ea4
commit d7849248dd
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavfilter/vf_alphamerge.c
View File

@ -158,11 +158,10 @@ static int request_frame(AVFilterLink *outlink)
AlphaMergeContext *merge = ctx->priv;
int in, ret;
/* TODO reindent */
in = ff_bufqueue_peek(&merge->queue_main, 0) ? 1 : 0;
ret = ff_request_frame(ctx->inputs[in]);
if (ret < 0)
return ret;
in = ff_bufqueue_peek(&merge->queue_main, 0) ? 1 : 0;
ret = ff_request_frame(ctx->inputs[in]);
if (ret < 0)
return ret;
return 0;
}