RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-12 10:15:22 +00:00
Code Issues Projects Releases Wiki Activity

mov: Rely on box type rather than file type for colr atom

Browse Source 
Although it's not allowed to use only allows 'nclc' in ISOM files, there
are samples that do not always respect this rule. This change prevents
atom overread and a spurious color range initialization.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
This commit is contained in:
Vittorio Giovara 2015-03-23 19:43:27 +00:00
parent f8fd0c29ce
commit be089af38f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/mov.c
View File

@ -992,7 +992,7 @@ static int mov_read_colr(MOVContext *c, AVIOContext *pb, MOVAtom atom)
av_dlog(c->fc, "%s: pri %"PRIu16" trc %"PRIu16" matrix %"PRIu16"", av_dlog(c->fc, "%s: pri %"PRIu16" trc %"PRIu16" matrix %"PRIu16"",
color_parameter_type, color_primaries, color_trc, color_matrix); color_parameter_type, color_primaries, color_trc, color_matrix);
if (c->isom) { if (!strncmp(color_parameter_type, "nclx", 4)) {
uint8_t color_range = avio_r8(pb) >> 7; uint8_t color_range = avio_r8(pb) >> 7;
av_dlog(c->fc, " full %"PRIu8"", color_range); av_dlog(c->fc, " full %"PRIu8"", color_range);
if (color_range) if (color_range)
@ -1012,7 +1012,7 @@ static int mov_read_colr(MOVContext *c, AVIOContext *pb, MOVAtom atom)
st->codec->color_primaries = color_primaries; st->codec->color_primaries = color_primaries;
st->codec->color_trc = color_trc; st->codec->color_trc = color_trc;
st->codec->colorspace = color_matrix; st->codec->colorspace = color_matrix;
} else { } else if (!strncmp(color_parameter_type, "nclc", 4)) {
/* color primaries, Table 4-4 */ /* color primaries, Table 4-4 */
switch (color_primaries) { switch (color_primaries) {
case 1: st->codec->color_primaries = AVCOL_PRI_BT709; break; case 1: st->codec->color_primaries = AVCOL_PRI_BT709; break;