avcodec/pngenc: fix mDCv typo

When mDCv support was added, there was a typo in both variable names
and also the MKTAG itself, incorrectly listing it as mDVc. The tag name
stands for Mastering Display Color Volume so mDCv is correct.

Typo originally introduced in 7894904141.

Signed-off-by: Leo Izen <leo.izen@gmail.com>
Reported-by: Ramiro Polla <ramiro.polla@gmail.com>
release/7.0
Leo Izen 7 months ago
parent 5ce0c37896
commit 89a85efbf1
No known key found for this signature in database
GPG Key ID: 764E48EA48221833
  1. 18
      libavcodec/pngenc.c

@ -449,17 +449,17 @@ static int encode_headers(AVCodecContext *avctx, const AVFrame *pict)
side_data = av_frame_get_side_data(pict, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA);
if (side_data) {
AVMasteringDisplayMetadata *mdvc = (AVMasteringDisplayMetadata *) side_data->data;
if (mdvc->has_luminance && mdvc->has_primaries) {
AVMasteringDisplayMetadata *mdcv = (AVMasteringDisplayMetadata *) side_data->data;
if (mdcv->has_luminance && mdcv->has_primaries) {
for (int i = 0; i < 3; i++) {
AV_WB16(s->buf + 2*i, PNG_Q2D(mdvc->display_primaries[i][0], 50000));
AV_WB16(s->buf + 2*i + 2, PNG_Q2D(mdvc->display_primaries[i][1], 50000));
AV_WB16(s->buf + 2*i, PNG_Q2D(mdcv->display_primaries[i][0], 50000));
AV_WB16(s->buf + 2*i + 2, PNG_Q2D(mdcv->display_primaries[i][1], 50000));
}
AV_WB16(s->buf + 12, PNG_Q2D(mdvc->white_point[0], 50000));
AV_WB16(s->buf + 14, PNG_Q2D(mdvc->white_point[1], 50000));
AV_WB32(s->buf + 16, PNG_Q2D(mdvc->max_luminance, 10000));
AV_WB32(s->buf + 20, PNG_Q2D(mdvc->min_luminance, 10000));
png_write_chunk(&s->bytestream, MKTAG('m', 'D', 'V', 'c'), s->buf, 24);
AV_WB16(s->buf + 12, PNG_Q2D(mdcv->white_point[0], 50000));
AV_WB16(s->buf + 14, PNG_Q2D(mdcv->white_point[1], 50000));
AV_WB32(s->buf + 16, PNG_Q2D(mdcv->max_luminance, 10000));
AV_WB32(s->buf + 20, PNG_Q2D(mdcv->min_luminance, 10000));
png_write_chunk(&s->bytestream, MKTAG('m', 'D', 'C', 'v'), s->buf, 24);
}
}

Loading…
Cancel
Save