diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-06-20 01:45:10 +0200 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-12-31 16:57:37 -0300 |
| commit | 4bc84f4f7deb12190998d898c84b7cbc5002ce8c (patch) | |
| tree | 3fa84a9d94ef8c098a492edb89744dc60a8f0574 /libavcodec/cbs_mpeg2_syntax_template.c | |
| parent | 662accb728639131638cd5be5f227b25a4559211 (diff) | |
| download | ffmpeg-4bc84f4f7deb12190998d898c84b7cbc5002ce8c.tar.gz | |
mpeg2_metadata, cbs_mpeg2: Fix handling of colour_description
If a sequence display extension is read with colour_description equal to
zero, but a user wants to add one or more of the colour_description
elements, then the colour_description elements the user did not explicitly
request to be set are set to zero and not to the value equal to
unknown/unspecified (namely 2). A value of zero is not only inappropriate,
but explicitly forbidden. This is fixed by inferring the right default
values during the reading process if the elements are absent; moreover,
changing any of the colour_description elements to zero is now no longer
possible.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit c2a91645c5b5cd6ed32089ec79cbb667326a8d8a)
Diffstat (limited to 'libavcodec/cbs_mpeg2_syntax_template.c')
| -rw-r--r-- | libavcodec/cbs_mpeg2_syntax_template.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/cbs_mpeg2_syntax_template.c b/libavcodec/cbs_mpeg2_syntax_template.c index e0cf716874..d9ef480f39 100644 --- a/libavcodec/cbs_mpeg2_syntax_template.c +++ b/libavcodec/cbs_mpeg2_syntax_template.c @@ -144,6 +144,10 @@ static int FUNC(sequence_display_extension)(CodedBitstreamContext *ctx, RWContex uir(8, transfer_characteristics); uir(8, matrix_coefficients); #endif + } else { + infer(colour_primaries, 2); + infer(transfer_characteristics, 2); + infer(matrix_coefficients, 2); } ui(14, display_horizontal_size); |