[SCM] libav/experimental: Return AVERROR(ENOMEM) when appropriate

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 0b38843a6cb46567e439d4db6830f8ae338b7935
Author: David Conrad <lessen42 at gmail.com>
Date:   Wed Sep 5 00:25:27 2007 +0000

    Return AVERROR(ENOMEM) when appropriate
    
    Originally committed as revision 10368 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index dfcf6f0..d7726bc 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -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));
     if (entries == NULL)
-        return -1;
+        return AVERROR(ENOMEM);
 
     entries[new_entry].elementid = elementid;
     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));
     if (entries == NULL)
-        return -1;
+        return AVERROR(ENOMEM);
 
     entries[new_entry].pts = pkt->pts;
     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);
     if (mkv->cues == NULL)
-        return -1;
+        return AVERROR(ENOMEM);
 
     return 0;
 }

-- 
Libav/FFmpeg packaging