av1_metadata: Fix constraint on setting chroma_sample_position
authorMark Thompson <sw@jkqxz.net>
Thu, 4 Oct 2018 22:29:04 +0000 (23:29 +0100)
committerMark Thompson <sw@jkqxz.net>
Sat, 6 Oct 2018 11:51:46 +0000 (12:51 +0100)
It can't be set for 4:2:2 streams.

libavcodec/av1_metadata_bsf.c

index 20c3a39..52d3836 100644 (file)
@@ -86,13 +86,9 @@ static int av1_metadata_update_sequence_header(AVBSFContext *bsf,
     }
 
     if (ctx->chroma_sample_position >= 0) {
-        if (clc->mono_chrome) {
+        if (clc->mono_chrome || !clc->subsampling_x || !clc->subsampling_y) {
             av_log(bsf, AV_LOG_WARNING, "Warning: chroma_sample_position "
-                   "is not meaningful for monochrome streams.\n");
-        } else if (clc->subsampling_x == 0 &&
-                   clc->subsampling_y == 0) {
-            av_log(bsf, AV_LOG_WARNING, "Warning: chroma_sample_position "
-                   "is not meaningful for non-chroma-subsampled streams.\n");
+                   "can only be set for 4:2:0 streams.\n");
         } else {
             clc->chroma_sample_position = ctx->chroma_sample_position;
         }