ffmpeg | branch: master | Carl Eugen Hoyos <[email protected]> | Tue Sep 1 09:17:26 2015 +0200| [0cb6c0ec488e324443b49b36f1224d3e5af420c4] | committer: Carl Eugen Hoyos
lavfi/scale: Pass src_range and dst_range to libswscale. Fixes ticket #4812. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0cb6c0ec488e324443b49b36f1224d3e5af420c4 --- libavfilter/version.h | 2 +- libavfilter/vf_scale.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libavfilter/version.h b/libavfilter/version.h index 93fc827..8145078 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 a1a19bb..a40b392 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; _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
