[FFmpeg-devel] [PATCH 2/2] avcodec/pngenc: fix mDCv typo

[Andreas Rheinhardt]

Sean McGovern:
> Hi Leo,
> 
> 
> On Tue, Jul 2, 2024, 09:44 Leo Izen <leo.izen at gmail.com> wrote:
> 
>> 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 78949041417caaef0c82b2b23d7defdd88aa2378.
>>
>> Signed-off-by: Leo Izen <leo.izen at gmail.com>
>> Reported-by: Ramiro Polla <ramiro.polla at gmail.com>
>> ---
>>  libavcodec/pngenc.c | 18 +++++++++---------
>>  1 file changed, 9 insertions(+), 9 deletions(-)
>>
>> diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c
>> index 89c3d5b83e..7ae16fa2c5 100644
>> --- a/libavcodec/pngenc.c
>> +++ b/libavcodec/pngenc.c
>> @@ -450,17 +450,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);
>>          }
>>      }
>>
>> --
>> 2.45.2
>>
>> _______________________________________________
>> ffmpeg-devel mailing list
>> ffmpeg-devel at ffmpeg.org
>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>
>> To unsubscribe, visit link above, or email
>> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".
>>
> 
> This did also land on the 7.0 branch so I assume it will get a backport if
> approved?
> 

Why should it be backported? This patch has no user-facing consequences.

- Andreas