generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavfi/vf_tile: simplify request_frame loop.

Browse Source
This commit is contained in:
Nicolas George 2013-03-31 19:19:35 +02:00
parent 69d67fb622
commit 77fa554b6e
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
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 */ /* 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 }); ff_draw_color(&tile->draw, &tile->blank, (uint8_t[]){ 0, 0, 0, -1 });
outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
return 0; return 0;
} }
@ -203,16 +205,9 @@ static int request_frame(AVFilterLink *outlink)
AVFilterLink *inlink = ctx->inputs[0]; AVFilterLink *inlink = ctx->inputs[0];
int r; int r;
while (1) { r = ff_request_frame(inlink);
r = ff_request_frame(inlink); if (r == AVERROR_EOF && tile->current)
if (r < 0) { r = end_last_frame(ctx);
if (r == AVERROR_EOF && tile->current)
r = end_last_frame(ctx);
break;
}
if (!tile->current) /* done */
break;
}
return r; return r;
} }