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:
8937af7
)
lavf/concatdec: fix crash in case a file in script cannot be opened
author
Stefano Sabatini
<stefasab@gmail.com>
Wed, 18 Dec 2013 13:56:36 +0000
(14:56 +0100)
committer
Stefano Sabatini
<stefasab@gmail.com>
Wed, 18 Dec 2013 14:14:58 +0000
(15:14 +0100)
libavformat/concatdec.c
patch
|
blob
|
history
diff --git
a/libavformat/concatdec.c
b/libavformat/concatdec.c
index
428c749
..
86f82e0
100644
(file)
--- a/
libavformat/concatdec.c
+++ b/
libavformat/concatdec.c
@@
-279,6
+279,9
@@
static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt)
(ret = open_next_file(avf)) < 0)
break;
}
+ if (ret < 0)
+ return ret;
+
delta = av_rescale_q(cat->cur_file->start_time - cat->avf->start_time,
AV_TIME_BASE_Q,
cat->avf->streams[pkt->stream_index]->time_base);