summaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2016-04-15 14:26:37 -0400
committerRonald S. Bultje <rsbultje@gmail.com>2016-04-17 09:28:30 -0400
commit6135aed0d2b2f630d34599eae6c7b908b39f5c63 (patch)
tree8b95459ce86aeb61d51379da6c85d7318d54a856 /libavfilter
parentc8d95e5ceb720b89b5ad055544fa5738125b151c (diff)
downloadffmpeg-streaming-6135aed0d2b2f630d34599eae6c7b908b39f5c63.zip
ffmpeg-streaming-6135aed0d2b2f630d34599eae6c7b908b39f5c63.tar.gz
vf_scale: support bt2020 in in/out_color_matrix properties.
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/vf_scale.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index ac9d4c3..22bee96 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -237,9 +237,11 @@ static const int *parse_yuv_type(const char *s, enum AVColorSpace colorspace)
colorspace = AVCOL_SPC_SMPTE240M;
} else if (s && (strstr(s, "bt601") || strstr(s, "bt470") || strstr(s, "smpte170m"))) {
colorspace = AVCOL_SPC_BT470BG;
+ } else if (s && strstr(s, "bt2020")) {
+ colorspace = AVCOL_SPC_BT2020_NCL;
}
- if (colorspace < 1 || colorspace > 7) {
+ if (colorspace < 1 || colorspace > 10 || colorspace == 8) {
colorspace = AVCOL_SPC_BT470BG;
}
OpenPOWER on IntegriCloud