highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

av1_metadata: Fix constraint on setting chroma_sample_position

Browse Source 
It can't be set for 4:2:2 streams.
This commit is contained in:
Mark Thompson 2018-10-04 23:29:04 +01:00
parent 50a2347b19
commit 6ff4473012
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/av1_metadata_bsf.c
View File

@ -86,13 +86,9 @@ static int av1_metadata_update_sequence_header(AVBSFContext *bsf,
} }
if (ctx->chroma_sample_position >= 0) { 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 " av_log(bsf, AV_LOG_WARNING, "Warning: chroma_sample_position "
"is not meaningful for monochrome streams.\n"); "can only be set for 4:2:0 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");
} else { } else {
clc->chroma_sample_position = ctx->chroma_sample_position; clc->chroma_sample_position = ctx->chroma_sample_position;
} }