summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2011-10-19 18:41:02 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-11-08 19:03:42 +0100
commitd484a07f1cb2fd416dd4e733ee793a1603c507bf (patch)
treef373e5de4b55cb5621cc47f1ceff48faf75e2f6a /libavformat
parent8045254bacca54bc5bb242f43b72564037b8a50d (diff)
downloadffmpeg-d484a07f1cb2fd416dd4e733ee793a1603c507bf.tar.gz
Do not call parse_keyframes_index with NULL stream.
Seems to fix trac issue #569. Sample is unfortunately not available, but it might be caused by an index existing for non-existing audio stream (?). Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> (cherry picked from commit 6ea6ff053af2aff8a9a898292f9640efa9290c9f)
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/flvdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index a2a3c5c493..c48224b445 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -210,7 +210,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst
case AMF_DATA_TYPE_OBJECT: {
unsigned int keylen;
- if (ioc->seekable && key && !strcmp(KEYFRAMES_TAG, key) && depth == 1)
+ if (vstream && ioc->seekable && key && !strcmp(KEYFRAMES_TAG, key) && depth == 1)
if (parse_keyframes_index(s, ioc, vstream, max_pos) < 0)
av_log(s, AV_LOG_ERROR, "Keyframe index parsing failed\n");