diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-09-01 09:17:26 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-09-01 09:17:26 +0200 |
| commit | 0cb6c0ec488e324443b49b36f1224d3e5af420c4 (patch) | |
| tree | b22e273fc84b14b8fc9702a05d77d667031ceb65 /libavfilter | |
| parent | 555f513769ecfa1449c6fcbb8cd51de7cae3efb1 (diff) | |
lavfi/scale: Pass src_range and dst_range to libswscale.
Fixes ticket #4812.
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/version.h | 2 | ||||
| -rw-r--r-- | libavfilter/vf_scale.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libavfilter/version.h b/libavfilter/version.h index 93fc827b56..8145078034 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,7 +31,7 @@ #define LIBAVFILTER_VERSION_MAJOR 5 #define LIBAVFILTER_VERSION_MINOR 40 -#define LIBAVFILTER_VERSION_MICRO 100 +#define LIBAVFILTER_VERSION_MICRO 101 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index a1a19bb63f..a40b392c65 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -374,6 +374,12 @@ static int config_props(AVFilterLink *outlink) av_opt_set_int(*s, "sws_flags", scale->flags, 0); av_opt_set_int(*s, "param0", scale->param[0], 0); av_opt_set_int(*s, "param1", scale->param[1], 0); + if (scale->in_range != AVCOL_RANGE_UNSPECIFIED) + av_opt_set_int(*s, "src_range", + scale->in_range == AVCOL_RANGE_JPEG, 0); + if (scale->out_range != AVCOL_RANGE_UNSPECIFIED) + av_opt_set_int(*s, "dst_range", + scale->out_range == AVCOL_RANGE_JPEG, 0); if (scale->opts) { AVDictionaryEntry *e = NULL; |