summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMark Thompson <sw@jkqxz.net>2018-10-04 23:29:04 +0100
committerMark Thompson <sw@jkqxz.net>2018-10-06 12:51:46 +0100
commit6ff4473012bc0131a3a47ff613c3c0aa5ecb1881 (patch)
tree84609bf225a10b9313e3603940f86cba507bc706 /libavcodec
parent50a2347b1949677d8ecfaf32369b4360a9cfa553 (diff)
av1_metadata: Fix constraint on setting chroma_sample_position
It can't be set for 4:2:2 streams.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/av1_metadata_bsf.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/libavcodec/av1_metadata_bsf.c b/libavcodec/av1_metadata_bsf.c
index 20c3a39da7..52d383661f 100644
--- a/libavcodec/av1_metadata_bsf.c
+++ b/libavcodec/av1_metadata_bsf.c
@@ -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;
}