Replace all remaining occurrences of AVERROR_NOMEM with

AVERROR(ENOMEM).

AVERROR_NOMEM is deprecated and will be dropped at the next libavutil
major bump.

Originally committed as revision 22791 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 9b1aeeceaad282057f507b27a6f985c37f403d82..182e4fbcb043c468b76980f34da22bede0cd2495 100644 (file)
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -216,7 +216,7 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx)
     if (avctx->error_recognition >= FF_ER_CAREFUL) {
         s->input_buffer = av_mallocz(AC3_FRAME_BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE);
         if (!s->input_buffer)
-            return AVERROR_NOMEM;
+            return AVERROR(ENOMEM);
     }
 
     avctx->sample_fmt = SAMPLE_FMT_S16;

diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c
index ce0be4bae7475bcd9bb25d88b00ea9e065d80dce..e5a908ea2142aae6f4feda8da170cc64bb2112de 100644 (file)
--- a/libavcodec/eatgv.c
+++ b/libavcodec/eatgv.c
@@ -288,11 +288,11 @@ static int tgv_decode_frame(AVCodecContext *avctx,
         /* allocate additional 12 bytes to accomodate av_memcpy_backptr() OUTBUF_PADDED optimisation */
         s->frame.data[0] = av_malloc(s->width*s->height + 12);
         if (!s->frame.data[0])
-            return AVERROR_NOMEM;
+            return AVERROR(ENOMEM);
         s->frame.data[1] = av_malloc(AVPALETTE_SIZE);
         if (!s->frame.data[1]) {
             av_freep(&s->frame.data[0]);
-            return AVERROR_NOMEM;
+            return AVERROR(ENOMEM);
         }
     }
     memcpy(s->frame.data[1], s->palette, AVPALETTE_SIZE);

diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index 33d8133a37b2522f02211c243e4d9dc7a8ae659d..89d40d5ac24fe20eeda779aa77ac7016764bab8b 100644 (file)
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -352,7 +352,7 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
     /* initialize MD5 context */
     s->md5ctx = av_malloc(av_md5_size);
     if(!s->md5ctx)
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
     av_md5_init(s->md5ctx);
 
     streaminfo = av_malloc(FLAC_STREAMINFO_SIZE);

diff --git a/libavcodec/gif.c b/libavcodec/gif.c
index c04f8bbc1ddd7e7f06fa76f5461219eb454a8148..5114b892263cf8ed777d8c306b5ea3c61a2356ea 100644 (file)
--- a/libavcodec/gif.c
+++ b/libavcodec/gif.c
@@ -133,10 +133,10 @@ static av_cold int gif_encode_init(AVCodecContext *avctx)
     avctx->coded_frame = &s->picture;
     s->lzw = av_mallocz(ff_lzw_encode_state_size);
     if (!s->lzw)
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
     s->buf = av_malloc(avctx->width*avctx->height*2);
     if (!s->buf)
-         return AVERROR_NOMEM;
+         return AVERROR(ENOMEM);
     return 0;
 }
 

diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c
index 9f54494c83eee3dca4efc3fccf9d42c921028b94..47b51456ddc4a7b39d8147c42235c09e0c6d869f 100644 (file)
--- a/libavdevice/vfwcap.c
+++ b/libavdevice/vfwcap.c
@@ -284,7 +284,7 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap)
     st = av_new_stream(s, 0);
     if(!st) {
         vfw_read_close(s);
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
     }
 
     /* Set video format */
@@ -294,7 +294,7 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap)
     bi = av_malloc(bisize);
     if(!bi) {
         vfw_read_close(s);
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
     }
     ret = SendMessage(ctx->hwnd, WM_CAP_GET_VIDEOFORMAT, bisize, (LPARAM) bi);
     if(!ret)

diff --git a/libavformat/ape.c b/libavformat/ape.c
index 102e191a3fc9725ad45685b0c38680cfebe8d8d9..91acf7240d0c4b435b3fdd4fcaf49148cddb541f 100644 (file)
--- a/libavformat/ape.c
+++ b/libavformat/ape.c
@@ -248,7 +248,7 @@ static int ape_read_header(AVFormatContext * s, AVFormatParameters * ap)
     }
     ape->frames       = av_malloc(ape->totalframes * sizeof(APEFrame));
     if(!ape->frames)
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
     ape->firstframe   = ape->junklength + ape->descriptorlength + ape->headerlength + ape->seektablelength + ape->wavheaderlength;
     ape->currentframe = 0;
 
@@ -351,7 +351,7 @@ static int ape_read_packet(AVFormatContext * s, AVPacket * pkt)
         nblocks = ape->blocksperframe;
 
     if (av_new_packet(pkt,  ape->frames[ape->currentframe].size + extra_size) < 0)
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
 
     AV_WL32(pkt->data    , nblocks);
     AV_WL32(pkt->data + 4, ape->frames[ape->currentframe].skip);

diff --git a/libavformat/apetag.c b/libavformat/apetag.c
index d8cad855bc8268eb4c56eba124596fbbbddaad15..d30c13222a637738c6958388e0ce9bbe586c6f5c 100644 (file)
--- a/libavformat/apetag.c
+++ b/libavformat/apetag.c
@@ -56,7 +56,7 @@ static int ape_tag_read_field(AVFormatContext *s)
         return -1;
     value = av_malloc(size+1);
     if (!value)
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
     get_buffer(pb, value, size);
     value[size] = 0;
     av_metadata_set2(&s->metadata, key, value, AV_METADATA_DONT_STRDUP_VAL);

diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c
index 720a49a8997dc50bb5a74cce442f791cdbdec3ad..3fe4eab5c74338847eb2cc405cffbe8fa373ba9c 100644 (file)
--- a/libavformat/cafdec.c
+++ b/libavformat/cafdec.c
@@ -61,7 +61,7 @@ static int read_desc_chunk(AVFormatContext *s)
     /* new audio stream */
     st = av_new_stream(s, 0);
     if (!st)
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
 
     /* parse format description */
     st->codec->codec_type  = AVMEDIA_TYPE_AUDIO;

diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c
index 02ae8ae628cee0a5d9680af5124d49413f36a457..2ceef964e88b000fa1194db0b3f87f2c05c2744c 100644 (file)
--- a/libavformat/flacdec.c
+++ b/libavformat/flacdec.c
@@ -67,7 +67,7 @@ static int flac_read_header(AVFormatContext *s,
         case FLAC_METADATA_TYPE_VORBIS_COMMENT:
             buffer = av_mallocz(metadata_size + FF_INPUT_BUFFER_PADDING_SIZE);
             if (!buffer) {
-                return AVERROR_NOMEM;
+                return AVERROR(ENOMEM);
             }
             if (get_buffer(s->pb, buffer, metadata_size) != metadata_size) {
                 av_freep(&buffer);

diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index adb94af956dc069cb9441dd1d79e3ced6dace89a..f05e3314ee323b524940112dadc6f124fcbdec3f 100644 (file)
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -433,7 +433,7 @@ static int mpegts_write_header(AVFormatContext *s)
             st->codec->extradata_size > 0) {
             ts_st->adts = av_mallocz(sizeof(*ts_st->adts));
             if (!ts_st->adts)
-                return AVERROR_NOMEM;
+                return AVERROR(ENOMEM);
             if (ff_adts_decode_extradata(s, ts_st->adts, st->codec->extradata,
                                          st->codec->extradata_size) < 0)
                 return -1;
@@ -836,7 +836,7 @@ static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt)
                 return -1;
             data = av_malloc(new_size);
             if (!data)
-                return AVERROR_NOMEM;
+                return AVERROR(ENOMEM);
             ff_adts_write_frame_header(adts, data, pkt->size, adts->pce_size);
             if (adts->pce_size) {
                 memcpy(data+ADTS_HEADER_SIZE, adts->pce_data, adts->pce_size);

diff --git a/libavformat/msnwc_tcp.c b/libavformat/msnwc_tcp.c
index 5b498e925eae4d9f11a19c950565a2a820438fb2..e5488718bc06375ec56bbe023d3184e4a98ee689 100644 (file)
--- a/libavformat/msnwc_tcp.c
+++ b/libavformat/msnwc_tcp.c
@@ -77,7 +77,7 @@ static int msnwc_tcp_read_header(AVFormatContext *ctx, AVFormatParameters *ap)
 
     st = av_new_stream(ctx, 0);
     if(!st)
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
 
     codec = st->codec;
     codec->codec_type = AVMEDIA_TYPE_VIDEO;

diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index 10fe20d04c4c35aedeebb244fab7b82c6d9fc028..36ea21cd41d7d7ef018f3801f28c833f135816ea 100644 (file)
--- a/libavformat/oggenc.c
+++ b/libavformat/oggenc.c
@@ -121,7 +121,7 @@ static int ogg_build_flac_headers(AVCodecContext *avctx,
     oggstream->header[0] = av_mallocz(51); // per ogg flac specs
     p = oggstream->header[0];
     if (!p)
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
     bytestream_put_byte(&p, 0x7F);
     bytestream_put_buffer(&p, "FLAC", 4);
     bytestream_put_byte(&p, 1); // major version
@@ -135,7 +135,7 @@ static int ogg_build_flac_headers(AVCodecContext *avctx,
     // second packet: VorbisComment
     p = ogg_write_vorbiscomment(4, bitexact, &oggstream->header_len[1], m);
     if (!p)
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
     oggstream->header[1] = p;
     bytestream_put_byte(&p, 0x84); // last metadata block and vorbis comment
     bytestream_put_be24(&p, oggstream->header_len[1] - 4);
@@ -157,7 +157,7 @@ static int ogg_build_speex_headers(AVCodecContext *avctx,
     // first packet: Speex header
     p = av_mallocz(SPEEX_HEADER_SIZE);
     if (!p)
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
     oggstream->header[0] = p;
     oggstream->header_len[0] = SPEEX_HEADER_SIZE;
     bytestream_put_buffer(&p, avctx->extradata, SPEEX_HEADER_SIZE);
@@ -166,7 +166,7 @@ static int ogg_build_speex_headers(AVCodecContext *avctx,
     // second packet: VorbisComment
     p = ogg_write_vorbiscomment(0, bitexact, &oggstream->header_len[1], m);
     if (!p)
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
     oggstream->header[1] = p;
 
     return 0;

diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index b8abcfc0b1c46c73793c876dfab06bce43e81b79..8fc0d96df169c7c16f456a7565eea5b23a76676b 100644 (file)
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -106,7 +106,7 @@ static int rm_read_extradata(ByteIOContext *pb, AVCodecContext *avctx, unsigned
         return -1;
     avctx->extradata = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
     if (!avctx->extradata)
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
     avctx->extradata_size = get_buffer(pb, avctx->extradata, size);
     memset(avctx->extradata + avctx->extradata_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
     if (avctx->extradata_size != size)

diff --git a/libavformat/rtpdec_amr.c b/libavformat/rtpdec_amr.c
index 38399c6660d03f065cda1d1c04bc086cc9fcb32c..a7b36c7ab72d31809d4c1404b5200959ae3aa4bd 100644 (file)
--- a/libavformat/rtpdec_amr.c
+++ b/libavformat/rtpdec_amr.c
@@ -83,7 +83,7 @@ static int amr_handle_packet(AVFormatContext *ctx,
     /* Everything except the codec mode request byte should be output. */
     if (av_new_packet(pkt, len - 1)) {
         av_log(ctx, AV_LOG_ERROR, "Out of memory\n");
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
     }
     pkt->stream_index = st->index;
     ptr = pkt->data;

diff --git a/libavformat/rtpdec_h263.c b/libavformat/rtpdec_h263.c
index 3d5925e9a4696b5baee397e53e1fa67ecf60c9c4..19de6eca266573c225ce128568d36e652cc397fd 100644 (file)
--- a/libavformat/rtpdec_h263.c
+++ b/libavformat/rtpdec_h263.c
@@ -78,7 +78,7 @@ static int h263_handle_packet(AVFormatContext *ctx,
 
     if (av_new_packet(pkt, len + startcode)) {
         av_log(ctx, AV_LOG_ERROR, "Out of memory\n");
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
     }
     pkt->stream_index = st->index;
     ptr = pkt->data;

diff --git a/libavformat/rtpdec_xiph.c b/libavformat/rtpdec_xiph.c
index 302f9858d3f5fafb258e1b3f3b68a38d3ce869ae..1c6eef7d9e349c88077f378bf92953bd42d3def5 100644 (file)
--- a/libavformat/rtpdec_xiph.c
+++ b/libavformat/rtpdec_xiph.c
@@ -134,7 +134,7 @@ static int xiph_handle_packet(AVFormatContext * ctx,
 
         if (av_new_packet(pkt, data_len)) {
             av_log(ctx, AV_LOG_ERROR, "Out of memory.\n");
-            return AVERROR_NOMEM;
+            return AVERROR(ENOMEM);
         }
         pkt->stream_index = st->index;
 
@@ -189,7 +189,7 @@ static int xiph_handle_packet(AVFormatContext * ctx,
 
             if (av_new_packet(pkt, frame_size)) {
                 av_log(ctx, AV_LOG_ERROR, "Out of memory.\n");
-                return AVERROR_NOMEM;
+                return AVERROR(ENOMEM);
             }
 
             memcpy(pkt->data, xiph_data, frame_size);
@@ -272,7 +272,7 @@ parse_packed_headers(const uint8_t * packed_headers,
     ptr = codec->extradata = av_malloc(extradata_alloc);
     if (!ptr) {
         av_log(codec, AV_LOG_ERROR, "Out of memory\n");
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
     }
     *ptr++ = 2;
     ptr += av_xiphlacing(ptr, length1);
@@ -331,7 +331,7 @@ static int xiph_parse_fmtp_pair(AVCodecContext * codec,
             } else {
                 av_log(codec, AV_LOG_ERROR,
                        "Out of memory while decoding SDP configuration.\n");
-                result = AVERROR_NOMEM;
+                result = AVERROR(ENOMEM);
             }
         } else {
             av_log(codec, AV_LOG_ERROR, "Packet too large\n");
@@ -356,7 +356,7 @@ static int xiph_parse_sdp_line(AVFormatContext *s, int st_index,
 
     if (!(value = av_malloc(value_size))) {
         av_log(codec, AV_LOG_ERROR, "Out of memory\n");
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
     }
 
     if (av_strstart(line, "fmtp:", &p)) {

diff --git a/libavformat/wc3movie.c b/libavformat/wc3movie.c
index 4138873573bd9dae7d74371986a3154d052fc4ea..a91df1b036e02b0105af80f50696b274c3a13449 100644 (file)
--- a/libavformat/wc3movie.c
+++ b/libavformat/wc3movie.c
@@ -186,7 +186,7 @@ static int wc3_read_header(AVFormatContext *s,
             /* load up the name */
             buffer = av_malloc(size+1);
             if (!buffer)
-                return AVERROR_NOMEM;
+                return AVERROR(ENOMEM);
             if ((ret = get_buffer(pb, buffer, size)) != size)
                 return AVERROR(EIO);
             buffer[size] = 0;