OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
6f0a171
)
avformat/mov: Read multiple stsd from DV
author
Vittorio Giovara
<vittorio.giovara@gmail.com>
Tue, 8 Nov 2016 03:32:05 +0000
(22:32 -0500)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Tue, 8 Nov 2016 13:07:41 +0000
(14:07 +0100)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/mov.c
patch
|
blob
|
history
diff --git
a/libavformat/mov.c
b/libavformat/mov.c
index
f06de06
..
ca978c2
100644
(file)
--- 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