diff options
| author | Steven Robertson <steven@strobe.cc> | 2012-07-27 14:00:04 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-07-27 14:00:04 +0200 |
| commit | b3841db133979721972807f67000789b8b3fa015 (patch) | |
| tree | bed2b4ff1cf410c60a065ceeaae70797c4e27532 /libavfilter/vf_alphamerge.c | |
| parent | 789f8cb03a08ea4346a0405b78287ed88df89bf1 (diff) | |
| download | ffmpeg-b3841db133979721972807f67000789b8b3fa015.tar.gz | |
vf_alphamerge: Fix reversed conditional
Reviewed-by: Nicolas George
Diffstat (limited to 'libavfilter/vf_alphamerge.c')
| -rw-r--r-- | libavfilter/vf_alphamerge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/vf_alphamerge.c b/libavfilter/vf_alphamerge.c index 278f9a3e03..fdcc01346b 100644 --- a/libavfilter/vf_alphamerge.c +++ b/libavfilter/vf_alphamerge.c @@ -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; |