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:
7d73d1c
)
add one missing check for stream existence in read_elst, fix #1364
author
Baptiste Coudurier
<baptiste.coudurier@gmail.com>
Mon, 7 Sep 2009 22:36:33 +0000
(22:36 +0000)
committer
Baptiste Coudurier
<baptiste.coudurier@gmail.com>
Mon, 7 Sep 2009 22:36:33 +0000
(22:36 +0000)
Originally committed as revision 19792 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/mov.c
patch
|
blob
|
history
diff --git
a/libavformat/mov.c
b/libavformat/mov.c
index
74698e0
..
5f11ebe
100644
(file)
--- a/
libavformat/mov.c
+++ b/
libavformat/mov.c
@@
-1905,9
+1905,13
@@
free_and_return:
/* edit list atom */
static int mov_read_elst(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
{
- MOVStreamContext *sc
= c->fc->streams[c->fc->nb_streams-1]->priv_data
;
+ MOVStreamContext *sc;
int i, edit_count;
+ if (c->fc->nb_streams < 1)
+ return 0;
+ sc = c->fc->streams[c->fc->nb_streams-1]->priv_data;
+
get_byte(pb); /* version */
get_be24(pb); /* flags */
edit_count = get_be32(pb); /* entries */