[FFmpeg-cvslog] vf_scale: support bt2020 in in/out_color_matrix properties.

[Ronald S. Bultje]

ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Fri Apr 15 14:26:37 2016 -0400| [6135aed0d2b2f630d34599eae6c7b908b39f5c63] | committer: Ronald S. Bultje

vf_scale: support bt2020 in in/out_color_matrix properties.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6135aed0d2b2f630d34599eae6c7b908b39f5c63
---

 libavfilter/vf_scale.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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;
     }