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
(parent:
9d06889
)
lavf/mov: Accept multiple fourcc for AVID 1:1.
author
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Mon, 12 Dec 2016 11:26:21 +0000
(12:26 +0100)
committer
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Mon, 12 Dec 2016 11:26:21 +0000
(12:26 +0100)
Fixes ticket #5982.
libavformat/mov.c
patch
|
blob
|
history
diff --git
a/libavformat/mov.c
b/libavformat/mov.c
index
0b1c182
..
6c8affc
100644
(file)
--- a/
libavformat/mov.c
+++ b/
libavformat/mov.c
@@
-2220,6
+2220,8
@@
static int mov_skip_multiple_stsd(MOVContext *c, AVIOContext *pb,
if (codec_tag &&
(codec_tag != format &&
+ // AVID 1:1 samples with differing data format and codec tag exist
+ (codec_tag != AV_RL32("AV1x") || format != AV_RL32("AVup")) &&
// 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)