generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'af7ca6ea124b82b337a6b96e10963e88eba57ebe'

Browse Source 
* commit 'af7ca6ea124b82b337a6b96e10963e88eba57ebe':
  nutdec: check av_new_packet return value

Conflicts:
	libavformat/nutdec.c

See: bb502411ddb9fe1928d4a999693a3a49b83f8698
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-22 00:17:29 +02:00
commit 42316907b8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/nutdec.c
View File

@ -994,11 +994,10 @@ static int decode_frame(NUTContext *nut, AVPacket *pkt, int frame_code)
{ {
AVFormatContext *s = nut->avf; AVFormatContext *s = nut->avf;
AVIOContext *bc = s->pb; AVIOContext *bc = s->pb;
int size, stream_id, discard; int size, stream_id, discard, ret;
int64_t pts, last_IP_pts; int64_t pts, last_IP_pts;
StreamContext *stc; StreamContext *stc;
uint8_t header_idx; uint8_t header_idx;
int ret;
size = decode_frame_header(nut, &pts, &stream_id, &header_idx, frame_code); size = decode_frame_header(nut, &pts, &stream_id, &header_idx, frame_code);
if (size < 0) if (size < 0)
@ -1020,8 +1019,9 @@ static int decode_frame(NUTContext *nut, AVPacket *pkt, int frame_code)
return 1; return 1;
} }
if (av_new_packet(pkt, size + nut->header_len[header_idx]) < 0) ret = av_new_packet(pkt, size + nut->header_len[header_idx]);
return AVERROR(ENOMEM); if (ret < 0)
return ret;
memcpy(pkt->data, nut->header[header_idx], nut->header_len[header_idx]); memcpy(pkt->data, nut->header[header_idx], nut->header_len[header_idx]);
pkt->pos = avio_tell(bc); // FIXME pkt->pos = avio_tell(bc); // FIXME
if (stc->last_flags & FLAG_SM_DATA) { if (stc->last_flags & FLAG_SM_DATA) {