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

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.
This commit is contained in:
Vittorio Giovara 2016-06-09 18:55:19 -04:00
parent 7672997004
commit 846a3e78a5
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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("hvc1") ||
codec_tag == AV_RL32("hev1") || codec_tag == AV_RL32("hev1") ||
(codec_tag != format && (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 (c->fc->video_codec_id ? video_codec_id != c->fc->video_codec_id
: codec_tag != MKTAG('j','p','e','g'))))) { : codec_tag != MKTAG('j','p','e','g'))))) {
/* Multiple fourcc, we skip JPEG. This is not correct, we should /* Multiple fourcc, we skip JPEG. This is not correct, we should