diff options
| author | Matthieu Bouron <matthieu.bouron@stupeflix.com> | 2016-07-13 16:56:20 +0200 |
|---|---|---|
| committer | Matthieu Bouron <matthieu.bouron@stupeflix.com> | 2016-07-13 16:56:20 +0200 |
| commit | 354336490da0c1ee2c887bbf8f25b46610233608 (patch) | |
| tree | e5e7f7bb84b2b8c20d701b18a0a79efc77877d2f | |
| parent | 3c058f570128dcfa3a68f0860e2be7f098e8d6e1 (diff) | |
| parent | 846a3e78a535f05ee61bb23a160f3378f041f751 (diff) | |
| download | ffmpeg-354336490da0c1ee2c887bbf8f25b46610233608.tar.gz | |
Merge commit '846a3e78a535f05ee61bb23a160f3378f041f751'
* commit '846a3e78a535f05ee61bb23a160f3378f041f751':
mov: Support prores with multiple stsd
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
| -rw-r--r-- | libavformat/mov.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 756d0e8c3c..2712364f4d 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2205,6 +2205,8 @@ static int mov_skip_multiple_stsd(MOVContext *c, AVIOContext *pb, if (codec_tag && (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 |