Skip to content

F
ffmpeg.wasm-core
Commit a765ba64 authored by Vittorio Giovara's avatar Vittorio Giovara Committed by Michael Niedermayer
Browse files
Options

avformat/mov: Read multiple stsd from DV 

Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 6f0a1710
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
libavformat/mov.c
View file @ a765ba64
...@@ -2213,6 +2213,8 @@ static int mov_skip_multiple_stsd(MOVContext *c, AVIOContext *pb, ...@@ -2213,6 +2213,8 @@ static int mov_skip_multiple_stsd(MOVContext *c, AVIOContext *pb,
(codec_tag != format && (codec_tag != format &&
// prores is allowed to have differing data format and codec tag // prores is allowed to have differing data format and codec tag
codec_tag != AV_RL32("apcn") && codec_tag != AV_RL32("apch") && 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 (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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment