diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-11-07 22:32:05 -0500 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-11-08 14:07:41 +0100 |
| commit | a765ba647d3d5ecb7270011693cb5b171f9afd01 (patch) | |
| tree | 74ff0e0f87652cb80fec32b5c86232daaf2fa19c /libavformat | |
| parent | 6f0a1710d77dde0d803861506a2157a23f08c14c (diff) | |
| download | ffmpeg-a765ba647d3d5ecb7270011693cb5b171f9afd01.tar.gz | |
avformat/mov: Read multiple stsd from DV
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
| -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 f06de061ad..ca978c282e 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2213,6 +2213,8 @@ static int mov_skip_multiple_stsd(MOVContext *c, AVIOContext *pb, (codec_tag != format && // prores is allowed to have differing data format and codec tag codec_tag != AV_RL32("apcn") && codec_tag != AV_RL32("apch") && + // so is dv (sigh) + codec_tag != AV_RL32("dvpp") && codec_tag != AV_RL32("dvcp") && (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 |