Browse Source

lavfi/vf_alphamerge: reindent after last commit.

tags/n3.0
Nicolas George 10 years ago
parent
commit
d7849248dd
1 changed files with 4 additions and 5 deletions
  1. +4
    -5
      libavfilter/vf_alphamerge.c

+ 4
- 5
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;
}



Loading…
Cancel
Save