diff options
author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-06-20 01:45:10 +0200 |
---|---|---|
committer | Mark Thompson <sw@jkqxz.net> | 2019-07-27 22:00:43 +0100 |
commit | c2a91645c5b5cd6ed32089ec79cbb667326a8d8a (patch) | |
tree | 3466ef47faca5d30917d7eccd0392d1d0325b1c7 /libavcodec/mpeg2_metadata_bsf.c | |
parent | 47b6ca0b022a413e392707464f2423795aa89bfb (diff) | |
download | ffmpeg-streaming-c2a91645c5b5cd6ed32089ec79cbb667326a8d8a.zip ffmpeg-streaming-c2a91645c5b5cd6ed32089ec79cbb667326a8d8a.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>
Diffstat (limited to 'libavcodec/mpeg2_metadata_bsf.c')
-rw-r--r-- | libavcodec/mpeg2_metadata_bsf.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libavcodec/mpeg2_metadata_bsf.c b/libavcodec/mpeg2_metadata_bsf.c index 6779ffd..3f371a0 100644 --- a/libavcodec/mpeg2_metadata_bsf.c +++ b/libavcodec/mpeg2_metadata_bsf.c @@ -213,6 +213,18 @@ static int mpeg2_metadata_init(AVBSFContext *bsf) CodedBitstreamFragment *frag = &ctx->fragment; int err; +#define VALIDITY_CHECK(name) do { \ + if (!ctx->name) { \ + av_log(bsf, AV_LOG_ERROR, "The value 0 for %s is " \ + "forbidden.\n", #name); \ + return AVERROR(EINVAL); \ + } \ + } while (0) + VALIDITY_CHECK(colour_primaries); + VALIDITY_CHECK(transfer_characteristics); + VALIDITY_CHECK(matrix_coefficients); +#undef VALIDITY_CHECK + err = ff_cbs_init(&ctx->cbc, AV_CODEC_ID_MPEG2VIDEO, bsf); if (err < 0) return err; |