diff options
| author | Mark Thompson <sw@jkqxz.net> | 2019-07-28 19:23:15 +0100 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-11-19 23:40:02 -0300 |
| commit | 82a3a623f0129b6ee16d3b553051b5e4a6a2b95a (patch) | |
| tree | 2801fc0c53dea9d729297839bedc955a0700b4d2 | |
| parent | 252ef2329a53230327ef57f69c9dc3fa7737e704 (diff) | |
| download | ffmpeg-82a3a623f0129b6ee16d3b553051b5e4a6a2b95a.tar.gz | |
cbs_h264: Fix missing inferred colour description fields
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)
| -rw-r--r-- | libavcodec/cbs_h264_syntax_template.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/cbs_h264_syntax_template.c b/libavcodec/cbs_h264_syntax_template.c index 26be6e590f..1671a15d33 100644 --- a/libavcodec/cbs_h264_syntax_template.c +++ b/libavcodec/cbs_h264_syntax_template.c @@ -137,6 +137,10 @@ static int FUNC(vui_parameters)(CodedBitstreamContext *ctx, RWContext *rw, ub(8, colour_primaries); ub(8, transfer_characteristics); ub(8, matrix_coefficients); + } else { + infer(colour_primaries, 2); + infer(transfer_characteristics, 2); + infer(matrix_coefficients, 2); } } else { infer(video_format, 5); |