RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vf_alphamerge: Fix reversed conditional 

Reviewed-by: Nicolas George
This commit is contained in:
Steven Robertson 2012-07-27 14:00:04 +02:00 committed by Carl Eugen Hoyos
parent 789f8cb03a
commit b3841db133
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/vf_alphamerge.c
View File

@ -168,7 +168,7 @@ static int request_frame(AVFilterLink *outlink)
merge->frame_requested = 1;
while (merge->frame_requested) {
in = ff_bufqueue_peek(&merge->queue_main, 0) ? 0 : 1;
in = ff_bufqueue_peek(&merge->queue_main, 0) ? 1 : 0;
ret = ff_request_frame(ctx->inputs[in]);
if (ret < 0)
return ret;