summaryrefslogtreecommitdiff
path: root/libavfilter/avf_concat.c
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2013-03-16 20:41:06 +0100
committerNicolas George <nicolas.george@normalesup.org>2013-03-20 21:13:56 +0100
commit8c6c811b2137afdfd78af3f5b43247e38fa88827 (patch)
treebbab206b6e891fe3c2cea550c2611bc00d213f55 /libavfilter/avf_concat.c
parentbefbcc374d8b8b00d6c70b64bfdc51dd25ba906d (diff)
lavfi/avf_concat: use standard options parsing.
Diffstat (limited to 'libavfilter/avf_concat.c')
-rw-r--r--libavfilter/avf_concat.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c
index 733a124428..2b3640b1b0 100644
--- a/libavfilter/avf_concat.c
+++ b/libavfilter/avf_concat.c
@@ -358,17 +358,8 @@ static int request_frame(AVFilterLink *outlink)
static av_cold int init(AVFilterContext *ctx, const char *args)
{
ConcatContext *cat = ctx->priv;
- int ret;
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 */
for (seg = 0; seg < cat->nb_segments; seg++) {
for (type = 0; type < TYPE_ALL; type++) {
@@ -418,6 +409,8 @@ static av_cold void uninit(AVFilterContext *ctx)
av_free(cat->in);
}
+static const char *const shorthand[] = { NULL };
+
AVFilter avfilter_avf_concat = {
.name = "concat",
.description = NULL_IF_CONFIG_SMALL("Concatenate audio and video streams."),
@@ -428,4 +421,5 @@ AVFilter avfilter_avf_concat = {
.inputs = NULL,
.outputs = NULL,
.priv_class = &concat_class,
+ .shorthand = shorthand,
};