summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2016-11-07 22:30:22 -0500
committerVittorio Giovara <vittorio.giovara@gmail.com>2016-11-08 11:22:29 -0500
commitde6e2ff3ddf506d5b487c2f226cea73e095ad6d1 (patch)
tree8930339b243cee9305e33464f533d5ebbaa788d8 /libavformat
parent47a795727f5433f5238a8a244cf181f61ea5af2c (diff)
mov: Read multiple stsd from DV
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mov.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index d4454bb218..b5b2a5b030 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1783,6 +1783,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