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

lavfi/avf_concat: use standard options parsing.

Browse Source
This commit is contained in:
Nicolas George 2013-03-16 20:41:06 +01:00
parent befbcc374d
commit 8c6c811b21
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavfilter/avf_concat.c
View File

@ -358,17 +358,8 @@ static int request_frame(AVFilterLink *outlink)
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx, const char *args)
{ {
ConcatContext *cat = ctx->priv; ConcatContext *cat = ctx->priv;
int ret;
unsigned seg, type, str; unsigned seg, type, str;
cat->class = &concat_class;
av_opt_set_defaults(cat);
ret = av_set_options_string(cat, args, "=", ":");
if (ret < 0) {
av_log(ctx, AV_LOG_ERROR, "Error parsing options: '%s'\n", args);
return ret;
}
/* create input pads */ /* create input pads */
for (seg = 0; seg < cat->nb_segments; seg++) { for (seg = 0; seg < cat->nb_segments; seg++) {
for (type = 0; type < TYPE_ALL; type++) { for (type = 0; type < TYPE_ALL; type++) {
@ -418,6 +409,8 @@ static av_cold void uninit(AVFilterContext *ctx)
av_free(cat->in); av_free(cat->in);
} }
static const char *const shorthand[] = { NULL };
AVFilter avfilter_avf_concat = { AVFilter avfilter_avf_concat = {
.name = "concat", .name = "concat",
.description = NULL_IF_CONFIG_SMALL("Concatenate audio and video streams."), .description = NULL_IF_CONFIG_SMALL("Concatenate audio and video streams."),
@ -428,4 +421,5 @@ AVFilter avfilter_avf_concat = {
.inputs = NULL, .inputs = NULL,
.outputs = NULL, .outputs = NULL,
.priv_class = &concat_class, .priv_class = &concat_class,
.shorthand = shorthand,
}; };