virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

avfilter/overlay: reindent

Browse Source
This commit is contained in:
Clément Bœsch 2014-06-29 13:26:12 +02:00
parent b18d1b094e
commit d5f817793e
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavfilter/vf_overlay.c
View File

@ -554,21 +554,20 @@ static AVFrame *do_blend(AVFilterContext *ctx, AVFrame *mainpic,
OverlayContext *s = ctx->priv; OverlayContext *s = ctx->priv;
AVFilterLink *inlink = ctx->inputs[0]; AVFilterLink *inlink = ctx->inputs[0];
/* TODO: reindent */ if (s->eval_mode == EVAL_MODE_FRAME) {
if (s->eval_mode == EVAL_MODE_FRAME) { int64_t pos = av_frame_get_pkt_pos(mainpic);
int64_t pos = av_frame_get_pkt_pos(mainpic);
s->var_values[VAR_N] = inlink->frame_count; s->var_values[VAR_N] = inlink->frame_count;
s->var_values[VAR_T] = mainpic->pts == AV_NOPTS_VALUE ? s->var_values[VAR_T] = mainpic->pts == AV_NOPTS_VALUE ?
NAN : mainpic->pts * av_q2d(inlink->time_base); NAN : mainpic->pts * av_q2d(inlink->time_base);
s->var_values[VAR_POS] = pos == -1 ? NAN : pos; s->var_values[VAR_POS] = pos == -1 ? NAN : pos;
eval_expr(ctx); eval_expr(ctx);
av_log(ctx, AV_LOG_DEBUG, "n:%f t:%f pos:%f x:%f xi:%d y:%f yi:%d\n", av_log(ctx, AV_LOG_DEBUG, "n:%f t:%f pos:%f x:%f xi:%d y:%f yi:%d\n",
s->var_values[VAR_N], s->var_values[VAR_T], s->var_values[VAR_POS], s->var_values[VAR_N], s->var_values[VAR_T], s->var_values[VAR_POS],
s->var_values[VAR_X], s->x, s->var_values[VAR_X], s->x,
s->var_values[VAR_Y], s->y); s->var_values[VAR_Y], s->y);
} }
blend_image(ctx, mainpic, second, s->x, s->y); blend_image(ctx, mainpic, second, s->x, s->y);
return mainpic; return mainpic;