OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8c6b8cb
)
mov: Set negative Sample_duration in STTS to 1
author
Thierry Foucu
<tfoucu@gmail.com>
Fri, 12 Aug 2011 23:27:59 +0000
(16:27 -0700)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 13 Aug 2011 01:39:58 +0000
(
03:39
+0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mov.c
patch
|
blob
|
history
diff --git
a/libavformat/mov.c
b/libavformat/mov.c
index
fdb29a0
..
96a9928
100644
(file)
--- a/
libavformat/mov.c
+++ b/
libavformat/mov.c
@@
-1471,6
+1471,11
@@
static int mov_read_stts(MOVContext *c, AVIOContext *pb, MOVAtom atom)
sample_count=avio_rb32(pb);
sample_duration = avio_rb32(pb);
+ /* sample_duration < 0 is invalid based on the spec */
+ if (sample_duration < 0) {
+ av_log(c->fc, AV_LOG_ERROR, "Invalid SampleDelta in STTS %d", sample_duration);
+ sample_duration = 1;
+ }
sc->stts_data[i].count= sample_count;
sc->stts_data[i].duration= sample_duration;