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:
def5dc1
)
mov: Allow empty stts atom.
author
Alex Converse
<alex.converse@gmail.com>
Sat, 3 Dec 2011 01:00:11 +0000
(17:00 -0800)
committer
Alex Converse
<alex.converse@gmail.com>
Sun, 4 Dec 2011 23:20:48 +0000
(15:20 -0800)
Fixes regressions caused by
30c3d976
libavformat/mov.c
patch
|
blob
|
history
diff --git
a/libavformat/mov.c
b/libavformat/mov.c
index
9f45441
..
e2bb4d6
100644
(file)
--- a/
libavformat/mov.c
+++ b/
libavformat/mov.c
@@
-1500,7
+1500,9
@@
static int mov_read_stts(MOVContext *c, AVIOContext *pb, MOVAtom atom)
av_dlog(c->fc, "track[%i].stts.entries = %i\n",
c->fc->nb_streams-1, entries);
- if (!entries || entries >= UINT_MAX / sizeof(*sc->stts_data))
+ if (!entries)
+ return 0;
+ if (entries >= UINT_MAX / sizeof(*sc->stts_data))
return AVERROR(EINVAL);
sc->stts_data = av_malloc(entries * sizeof(*sc->stts_data));