diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2012-05-20 16:32:03 +0400 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2012-05-20 20:24:20 +0400 |
| commit | 2987efe9baf96b627292013fc9b9ddaf9bc5a227 (patch) | |
| tree | c692ace4cc21aa13f7fb716b05aec2164586f8da /libavfilter | |
| parent | 5732f40e3f15f3df8e42961a3cb3e6d1bc799f1e (diff) | |
vf_ass: use AV_OPT_TYPE_IMAGE_SIZE.
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_ass.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/libavfilter/vf_ass.c b/libavfilter/vf_ass.c index c6a63c1717..c828699ae1 100644 --- a/libavfilter/vf_ass.c +++ b/libavfilter/vf_ass.c @@ -43,7 +43,6 @@ typedef struct { char *filename; uint8_t rgba_map[4]; int pix_step[4]; ///< steps per pixel for each plane of the main output - char *original_size_str; int original_w, original_h; FFDrawContext draw; } AssContext; @@ -51,7 +50,7 @@ typedef struct { #define OFFSET(x) offsetof(AssContext, x) static const AVOption ass_options[] = { - {"original_size", "set the size of the original video (used to scale fonts)", OFFSET(original_size_str), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX }, + {"original_size", "set the size of the original video (used to scale fonts)", OFFSET(original_w), AV_OPT_TYPE_IMAGE_SIZE, {.str = NULL}, CHAR_MIN, CHAR_MAX }, {NULL}, }; @@ -106,14 +105,6 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) return ret; } - if (ass->original_size_str && - av_parse_video_size(&ass->original_w, &ass->original_h, - ass->original_size_str) < 0) { - av_log(ctx, AV_LOG_ERROR, - "Invalid original size '%s'.\n", ass->original_size_str); - return AVERROR(EINVAL); - } - ass->library = ass_library_init(); if (!ass->library) { av_log(ctx, AV_LOG_ERROR, "Could not initialize libass.\n"); @@ -144,7 +135,6 @@ static av_cold void uninit(AVFilterContext *ctx) AssContext *ass = ctx->priv; av_freep(&ass->filename); - av_freep(&ass->original_size_str); if (ass->track) ass_free_track(ass->track); if (ass->renderer) |