lavfi/vf_alphamerge: reindent after last commit.

pull/154/head
Nicolas George 9 years ago
parent 35c3043ea4
commit d7849248dd
  1. 9
      libavfilter/vf_alphamerge.c

@ -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;
}

Loading…
Cancel
Save