highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'b9b689550e7531b1a2cc893d2af623e37f266936' into release/2.4

Browse Source 
* commit 'b9b689550e7531b1a2cc893d2af623e37f266936':
  img2dec: check av_new_packet return value

Conflicts:
	libavformat/img2dec.c

See: 3f8148911c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-01-18 01:19:35 +01:00
parent 298f7f1fac b9b689550e
commit 324797eb83
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/img2dec.c
View File

@@ -360,7 +360,7 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt)
VideoDemuxData *s = s1->priv_data; VideoDemuxData *s = s1->priv_data;
char filename_bytes[1024]; char filename_bytes[1024];
char *filename = filename_bytes; char *filename = filename_bytes;
int i; int i, res;
int size[3] = { 0 }, ret[3] = { 0 }; int size[3] = { 0 }, ret[3] = { 0 };
AVIOContext *f[3] = { NULL }; AVIOContext *f[3] = { NULL };
AVCodecContext *codec = s1->streams[0]->codec; 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) res = av_new_packet(pkt, size[0] + size[1] + size[2]);
return AVERROR(ENOMEM); if (res < 0)
return res;
pkt->stream_index = 0; pkt->stream_index = 0;
pkt->flags |= AV_PKT_FLAG_KEY; pkt->flags |= AV_PKT_FLAG_KEY;
if (s->ts_from_file) { if (s->ts_from_file) {