flvdec: Do not call parse_keyframes_index with a NULL stream

Signed-off-by: Martin Storsjö <martin@martin.st>
13 years ago · f4b51d061f
parent b19e0c2b4e
commit f4b51d061f
1 changed files with 3 additions and 2 deletions
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@ -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))) {