mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-20 06:20:40 +00:00
Return AVERROR(ENOMEM) when appropriate
Originally committed as revision 10368 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
47e08c5860
commit
0b38843a6c
@ -270,7 +270,7 @@ static int mkv_add_seekhead_entry(mkv_seekhead *seekhead, unsigned int elementid
|
|||||||
|
|
||||||
entries = av_realloc(entries, (seekhead->num_entries + 1) * sizeof(mkv_seekhead_entry));
|
entries = av_realloc(entries, (seekhead->num_entries + 1) * sizeof(mkv_seekhead_entry));
|
||||||
if (entries == NULL)
|
if (entries == NULL)
|
||||||
return -1;
|
return AVERROR(ENOMEM);
|
||||||
|
|
||||||
entries[new_entry].elementid = elementid;
|
entries[new_entry].elementid = elementid;
|
||||||
entries[new_entry].segmentpos = filepos - seekhead->segment_offset;
|
entries[new_entry].segmentpos = filepos - seekhead->segment_offset;
|
||||||
@ -345,7 +345,7 @@ static int mkv_add_cuepoint(mkv_cues *cues, AVPacket *pkt, offset_t cluster_pos)
|
|||||||
|
|
||||||
entries = av_realloc(entries, (cues->num_entries + 1) * sizeof(mkv_cuepoint));
|
entries = av_realloc(entries, (cues->num_entries + 1) * sizeof(mkv_cuepoint));
|
||||||
if (entries == NULL)
|
if (entries == NULL)
|
||||||
return -1;
|
return AVERROR(ENOMEM);
|
||||||
|
|
||||||
entries[new_entry].pts = pkt->pts;
|
entries[new_entry].pts = pkt->pts;
|
||||||
entries[new_entry].tracknum = pkt->stream_index + 1;
|
entries[new_entry].tracknum = pkt->stream_index + 1;
|
||||||
@ -668,7 +668,7 @@ static int mkv_write_header(AVFormatContext *s)
|
|||||||
|
|
||||||
mkv->cues = mkv_start_cues(mkv->segment_offset);
|
mkv->cues = mkv_start_cues(mkv->segment_offset);
|
||||||
if (mkv->cues == NULL)
|
if (mkv->cues == NULL)
|
||||||
return -1;
|
return AVERROR(ENOMEM);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user