diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-25 03:37:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-25 03:37:21 +0200 |
| commit | d6095662706d3f0b334645eb7f92ed24a4d9e4ed (patch) | |
| tree | f3938dfd8567ea1868ddc11ad9a5eec05925d71f /libavformat | |
| parent | 6d2a2bfb59f849fadc82374aa8463ac34444ba82 (diff) | |
| parent | f1ed83e23add1c26c50b146727e4c2399dfc0b3a (diff) | |
Merge commit 'f1ed83e23add1c26c50b146727e4c2399dfc0b3a'
* commit 'f1ed83e23add1c26c50b146727e4c2399dfc0b3a':
img2dec: check av_new_packet return value
Conflicts:
libavformat/img2dec.c
See: 3f8148911c6e6e1f2a042bd4ca3ad8516a92130c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/img2dec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 5f4e72372c..a20868cbaf 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -360,7 +360,7 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt) VideoDemuxData *s = s1->priv_data; char filename_bytes[1024]; char *filename = filename_bytes; - int i; + int i, res; int size[3] = { 0 }, ret[3] = { 0 }; AVIOContext *f[3] = { NULL }; AVCodecContext *codec = s1->streams[0]->codec; @@ -436,8 +436,9 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt) } } - if (av_new_packet(pkt, size[0] + size[1] + size[2]) < 0) - return AVERROR(ENOMEM); + res = av_new_packet(pkt, size[0] + size[1] + size[2]); + if (res < 0) + return res; pkt->stream_index = 0; pkt->flags |= AV_PKT_FLAG_KEY; if (s->ts_from_file) { |