virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

flvdec: Do not call parse_keyframes_index with a NULL stream

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Reimar Döffinger 2011-10-19 18:41:02 +02:00 committed by Martin Storsjö
parent b19e0c2b4e
commit f4b51d061f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/flvdec.c
View File

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