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

Vittorio Giovara git at videolan.org
Tue Nov 8 15:07:58 EET 2016


ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Mon Nov  7 22:32:05 2016 -0500| [a765ba647d3d5ecb7270011693cb5b171f9afd01] | committer: Michael Niedermayer

avformat/mov: Read multiple stsd from DV

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

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

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



More information about the ffmpeg-cvslog mailing list