RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 01:02:33 +00:00
Code Issues Projects Releases Wiki Activity

flvdec: make sure to check create_stream and report the same error

Browse Source 
CC: libav-stable@libav.org
Bug-Id: CID 732242
This commit is contained in:
Vittorio Giovara 2014-10-20 12:56:41 +01:00
parent f22aa6b841
commit 629b2ed0ac
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/flvdec.c
View File

@ -717,7 +717,7 @@ static int flv_data_packet(AVFormatContext *s, AVPacket *pkt,
if (i == s->nb_streams) {
st = create_stream(s, AVMEDIA_TYPE_DATA);
if (!st)
return AVERROR_INVALIDDATA;
return AVERROR(ENOMEM);
st->codec->codec_id = AV_CODEC_ID_TEXT;
}
@ -817,9 +817,12 @@ skip:
break;
}
}
if (i == s->nb_streams)
if (i == s->nb_streams) {
st = create_stream(s, is_audio ? AVMEDIA_TYPE_AUDIO
: AVMEDIA_TYPE_VIDEO);
if (!st)
return AVERROR(ENOMEM);
}
av_dlog(s, "%d %X %d \n", is_audio, flags, st->discard);
if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY ||