flvdec: Do not call parse_keyframes_index with a NULL stream
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>
Wed, 19 Oct 2011 16:41:02 +0000 (18:41 +0200)
committerMartin Storsjö <martin@martin.st>
Fri, 21 Oct 2011 21:59:33 +0000 (00:59 +0300)
Signed-off-by: Martin Storsjö <martin@martin.st>
libavformat/flvdec.c

index 395c8f8..1459850 100644 (file)
@@ -239,8 +239,9 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst
         case AMF_DATA_TYPE_OBJECT: {
             unsigned int keylen;
 
-            if (key && !strcmp(KEYFRAMES_TAG, key) && depth == 1)
-                if (parse_keyframes_index(s, ioc, vstream, max_pos) < 0)
+            if ((vstream || astream) && key && !strcmp(KEYFRAMES_TAG, key) && depth == 1)
+                if (parse_keyframes_index(s, ioc, vstream ? vstream : astream,
+                                          max_pos) < 0)
                     return -1;
 
             while(avio_tell(ioc) < max_pos - 2 && (keylen = avio_rb16(ioc))) {