Browse Source

lavfi/vf_tile: simplify request_frame loop.

tags/n2.0
Nicolas George 13 years ago
parent
commit
77fa554b6e
1 changed files with 5 additions and 10 deletions
  1. +5
    -10
      libavfilter/vf_tile.c

+ 5
- 10
libavfilter/vf_tile.c View File

@@ -116,6 +116,8 @@ static int config_props(AVFilterLink *outlink)
/* TODO make the color an option, or find an unified way of choosing it */
ff_draw_color(&tile->draw, &tile->blank, (uint8_t[]){ 0, 0, 0, -1 });

outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;

return 0;
}

@@ -203,16 +205,9 @@ static int request_frame(AVFilterLink *outlink)
AVFilterLink *inlink = ctx->inputs[0];
int r;

while (1) {
r = ff_request_frame(inlink);
if (r < 0) {
if (r == AVERROR_EOF && tile->current)
r = end_last_frame(ctx);
break;
}
if (!tile->current) /* done */
break;
}
r = ff_request_frame(inlink);
if (r == AVERROR_EOF && tile->current)
r = end_last_frame(ctx);
return r;
}



Loading…
Cancel
Save