History

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

Vittorio Giovara committed 12 years ago

Commit 629b2ed1 parent f22aa6b1 file · +5 −2Browse files

Unified · Split

libavformat/flvdec.c+5−2
@@ -717,7 +717,7 @@ static int flv_data_packet(AVFormatContext *s, AVPacket *pkt, · 716 unmodified lines
717717 if (i == s->nb_streams) {
718718 st = create_stream(s, AVMEDIA_TYPE_DATA);
719719 if (!st)
720− return AVERROR_INVALIDDATA;
720+ return AVERROR(ENOMEM);
721721 st->codec->codec_id = AV_CODEC_ID_TEXT;
722722 }
723723
@@ -817,9 +817,12 @@ skip: · 93 unmodified lines
817817 break;
818818 }
819819 }
820− if (i == s->nb_streams)
820+ if (i == s->nb_streams) {
821821 st = create_stream(s, is_audio ? AVMEDIA_TYPE_AUDIO
822822 : AVMEDIA_TYPE_VIDEO);
823+ if (!st)
824+ return AVERROR(ENOMEM);
825+ }
823826 av_dlog(s, "%d %X %d \n", is_audio, flags, st->discard);
824827
825828 if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY ||

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t