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

cbs_h264: Fix missing inferred colour description fields

Browse Source 
With video_signal_type_present_flag set but colour_description_present_flag
unset the colour fields would not have had their correct values inferred.

(cherry picked from commit f9b8503639c0ff90846f07c92e2fe7836690dd0c)
This commit is contained in:
Mark Thompson 2019-07-28 19:23:15 +01:00 committed by James Almer
parent 1ad3418519
commit 07afe2e3ca
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/cbs_h264_syntax_template.c
View File

@ -137,6 +137,10 @@ static int FUNC(vui_parameters)(CodedBitstreamContext *ctx, RWContext *rw,
u(8, colour_primaries, 0, 255);
u(8, transfer_characteristics, 0, 255);
u(8, matrix_coefficients, 0, 255);
} else {
infer(colour_primaries, 2);
infer(transfer_characteristics, 2);
infer(matrix_coefficients, 2);
}
} else {
infer(video_format, 5);