[FFmpeg-devel] [PATCH 02/14] lavfi/avf_concat: use standard options parsing.
Nicolas George
nicolas.george at normalesup.org
Sat Mar 16 21:39:22 CET 2013
Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
---
libavfilter/avf_concat.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c
index 7b5d591..192269f 100644
--- a/libavfilter/avf_concat.c
+++ b/libavfilter/avf_concat.c
@@ -354,17 +354,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++) {
@@ -414,6 +405,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."),
@@ -424,4 +417,5 @@ AVFilter avfilter_avf_concat = {
.inputs = NULL,
.outputs = NULL,
.priv_class = &concat_class,
+ .shorthand = shorthand,
};
--
1.7.10.4
More information about the ffmpeg-devel
mailing list