diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2013-03-16 20:41:36 +0100 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2013-03-20 21:13:56 +0100 |
| commit | e9f45a833d49a4c65caf449741a6f154243ce147 (patch) | |
| tree | f85823512611921d6d18cf6464b25ee7ca0cdaba | |
| parent | 8c6c811b2137afdfd78af3f5b43247e38fa88827 (diff) | |
| download | ffmpeg-e9f45a833d49a4c65caf449741a6f154243ce147.tar.gz | |
lavfi/vf_tile: use standard options parsing.
| -rw-r--r-- | libavfilter/vf_tile.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libavfilter/vf_tile.c b/libavfilter/vf_tile.c index 30c9809374..b45cbb81bb 100644 --- a/libavfilter/vf_tile.c +++ b/libavfilter/vf_tile.c @@ -65,14 +65,6 @@ AVFILTER_DEFINE_CLASS(tile); static av_cold int init(AVFilterContext *ctx, const char *args) { TileContext *tile = ctx->priv; - static const char *shorthand[] = { "layout", "nb_frames", "margin", "padding", NULL }; - int ret; - - tile->class = &tile_class; - av_opt_set_defaults(tile); - - if ((ret = av_opt_set_from_string(tile, args, shorthand, "=", ":")) < 0) - return ret; if (tile->w > REASONABLE_SIZE || tile->h > REASONABLE_SIZE) { av_log(ctx, AV_LOG_ERROR, "Tile size %ux%u is insane.\n", @@ -243,6 +235,9 @@ static const AVFilterPad tile_outputs[] = { { NULL } }; +static const char *const shorthand[] = + { "layout", "nb_frames", "margin", "padding", NULL }; + AVFilter avfilter_vf_tile = { .name = "tile", .description = NULL_IF_CONFIG_SMALL("Tile several successive frames together."), @@ -252,4 +247,5 @@ AVFilter avfilter_vf_tile = { .inputs = tile_inputs, .outputs = tile_outputs, .priv_class = &tile_class, + .shorthand = shorthand, }; |