diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-21 22:35:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-21 22:35:30 +0200 |
| commit | 3099008f07808dcf6edb2311fb1ee050444ffd1d (patch) | |
| tree | 645fc17239e5e2df6ecf58b7050cc23792598e73 /libavformat | |
| parent | 1922357e5a05eb5a3e6859097264224d8878fa9c (diff) | |
| parent | 629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae (diff) | |
| download | ffmpeg-3099008f07808dcf6edb2311fb1ee050444ffd1d.tar.gz | |
Merge commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae'
* commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae':
flvdec: make sure to check create_stream and report the same error
Conflicts:
libavformat/flvdec.c
See: d7d5b5dfc1b6f29646d2c1908c9bac8677f34256
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/flvdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 2eaa8cda9f..1c70a72dec 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -746,7 +746,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; } |