RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/mov: simplify parsing of mdcv atom using av_make_q() 

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-12-21 01:23:17 -03:00
parent 22ae33fb40
commit bc10260f49
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/mov.c
View File

@ -5210,20 +5210,14 @@ static int mov_read_mdcv(MOVContext *c, AVIOContext *pb, MOVAtom atom)
for (i = 0; i < 3; i++) {
const int j = mapping[i];
sc->mastering->display_primaries[j][0].num = avio_rb16(pb);
sc->mastering->display_primaries[j][0].den = chroma_den;
sc->mastering->display_primaries[j][1].num = avio_rb16(pb);
sc->mastering->display_primaries[j][1].den = chroma_den;
sc->mastering->display_primaries[j][0] = av_make_q(avio_rb16(pb), chroma_den);
sc->mastering->display_primaries[j][1] = av_make_q(avio_rb16(pb), chroma_den);
}
sc->mastering->white_point[0].num = avio_rb16(pb);
sc->mastering->white_point[0].den = chroma_den;
sc->mastering->white_point[1].num = avio_rb16(pb);
sc->mastering->white_point[1].den = chroma_den;
sc->mastering->white_point[0] = av_make_q(avio_rb16(pb), chroma_den);
sc->mastering->white_point[1] = av_make_q(avio_rb16(pb), chroma_den);
sc->mastering->max_luminance.num = avio_rb32(pb);
sc->mastering->max_luminance.den = luma_den;
sc->mastering->min_luminance.num = avio_rb32(pb);
sc->mastering->min_luminance.den = luma_den;
sc->mastering->max_luminance = av_make_q(avio_rb32(pb), luma_den);
sc->mastering->min_luminance = av_make_q(avio_rb32(pb), luma_den);
sc->mastering->has_luminance = 1;
sc->mastering->has_primaries = 1;