Skip to content

F
ffmpeg.wasm-core
Commit 629b2ed0 authored by Vittorio Giovara's avatar Vittorio Giovara
Browse files
Options

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

CC: libav-stable@libav.org
Bug-Id: CID 732242
parent f22aa6b8
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
libavformat/flvdec.c
View file @ 629b2ed0
...@@ -717,7 +717,7 @@ static int flv_data_packet(AVFormatContext *s, AVPacket *pkt, ...@@ -717,7 +717,7 @@ static int flv_data_packet(AVFormatContext *s, AVPacket *pkt,
if (i == s->nb_streams) { if (i == s->nb_streams) {
st = create_stream(s, AVMEDIA_TYPE_DATA); st = create_stream(s, AVMEDIA_TYPE_DATA);
if (!st) if (!st)
return AVERROR_INVALIDDATA; return AVERROR(ENOMEM);
st->codec->codec_id = AV_CODEC_ID_TEXT; st->codec->codec_id = AV_CODEC_ID_TEXT;
} }
...@@ -817,9 +817,12 @@ skip: ...@@ -817,9 +817,12 @@ skip:
break; break;
} }
} }
if (i == s->nb_streams) if (i == s->nb_streams) {
st = create_stream(s, is_audio ? AVMEDIA_TYPE_AUDIO st = create_stream(s, is_audio ? AVMEDIA_TYPE_AUDIO
: AVMEDIA_TYPE_VIDEO); : AVMEDIA_TYPE_VIDEO);
if (!st)
return AVERROR(ENOMEM);
}
av_dlog(s, "%d %X %d \n", is_audio, flags, st->discard); av_dlog(s, "%d %X %d \n", is_audio, flags, st->discard);
if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment