Browse Source

mov: Support prores with multiple stsd

This function needs to return false, or data in the additional tables
will be skipped, and the decoder will not be able to decode frames
associated with them.
tags/n3.2
Vittorio Giovara 9 years ago
parent
commit
846a3e78a5
1 changed files with 2 additions and 0 deletions
  1. +2
    -0
      libavformat/mov.c

+ 2
- 0
libavformat/mov.c View File

@@ -1774,6 +1774,8 @@ static int mov_skip_multiple_stsd(MOVContext *c, AVIOContext *pb,
(codec_tag == AV_RL32("hvc1") ||
codec_tag == AV_RL32("hev1") ||
(codec_tag != format &&
// prores is allowed to have differing data format and codec tag
codec_tag != AV_RL32("apcn") && codec_tag != AV_RL32("apch") &&
(c->fc->video_codec_id ? video_codec_id != c->fc->video_codec_id
: codec_tag != MKTAG('j','p','e','g'))))) {
/* Multiple fourcc, we skip JPEG. This is not correct, we should


Loading…
Cancel
Save