diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-10-16 18:10:59 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-10-22 10:46:43 +0200 |
| commit | 6752aac6bca7be37013dc7540759d2dfc390dadf (patch) | |
| tree | 8a7717c4ed7b9fb9a98c62f3ed497cdd27a2f620 /libavfilter | |
| parent | ccd6def9b3dcdb97a18710e6fd13f35498589849 (diff) | |
| download | ffmpeg-6752aac6bca7be37013dc7540759d2dfc390dadf.tar.gz | |
lavfi/aspect: add max option
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/version.h | 2 | ||||
| -rw-r--r-- | libavfilter/vf_aspect.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libavfilter/version.h b/libavfilter/version.h index 55695b987b..534027b461 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -30,7 +30,7 @@ #define LIBAVFILTER_VERSION_MAJOR 3 #define LIBAVFILTER_VERSION_MINOR 20 -#define LIBAVFILTER_VERSION_MICRO 103 +#define LIBAVFILTER_VERSION_MICRO 104 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c index 041691a84e..ca4753d832 100644 --- a/libavfilter/vf_aspect.c +++ b/libavfilter/vf_aspect.c @@ -35,12 +35,14 @@ typedef struct { const AVClass *class; AVRational ratio; char *ratio_str; + int max; } AspectContext; #define OFFSET(x) offsetof(AspectContext, x) #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM static const AVOption options[] = { + {"max", "set max value for nominator or denominator in the ratio", OFFSET(max), AV_OPT_TYPE_INT, {.i64=100}, 1, INT_MAX, FLAGS }, {"ratio", "set ratio", OFFSET(ratio_str), AV_OPT_TYPE_STRING, {.str="0"}, 0, 0, FLAGS }, {"r", "set ratio", OFFSET(ratio_str), AV_OPT_TYPE_STRING, {.str="0"}, 0, 0, FLAGS }, {NULL} @@ -49,7 +51,7 @@ static const AVOption options[] = { static av_cold int init(AVFilterContext *ctx, const char *args, const AVClass *class) { AspectContext *aspect = ctx->priv; - static const char *shorthand[] = { "ratio", NULL }; + static const char *shorthand[] = { "ratio", "max", NULL }; char c; int ret; AVRational q; @@ -66,7 +68,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args, const AVClass *c } if (aspect->ratio_str) { - ret = av_parse_ratio(&aspect->ratio, aspect->ratio_str, 100, 0, ctx); + ret = av_parse_ratio(&aspect->ratio, aspect->ratio_str, aspect->max, 0, ctx); if (ret < 0 || aspect->ratio.num < 0 || aspect->ratio.den <= 0) { av_log(ctx, AV_LOG_ERROR, "Invalid string '%s' for aspect ratio\n", args); |