[FFmpeg-cvslog] mov: Read multiple stsd from DV

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Mon Nov  7 22:30:22 2016 -0500| [de6e2ff3ddf506d5b487c2f226cea73e095ad6d1] | committer: Vittorio Giovara

mov: Read multiple stsd from DV

Signed-off-by: Vittorio Giovara <vittorio.giovara at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=de6e2ff3ddf506d5b487c2f226cea73e095ad6d1
---

 libavformat/mov.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index d4454bb..b5b2a5b 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