# HG changeset patch # User stefano # Date 1270304100 0 # Node ID 998691d7f8f58c31514e3fc375e620421484b802 # Parent baf1f1555e92996ed54aa0ccf8c39b7615ca23a5 Replace all remaining occurrences of AVERROR_NOMEM with AVERROR(ENOMEM). AVERROR_NOMEM is deprecated and will be dropped at the next libavutil major bump. diff -r baf1f1555e92 -r 998691d7f8f5 ac3dec.c --- a/ac3dec.c Fri Apr 02 16:26:10 2010 +0000 +++ b/ac3dec.c Sat Apr 03 14:15:00 2010 +0000 @@ -216,7 +216,7 @@ 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 -r baf1f1555e92 -r 998691d7f8f5 eatgv.c --- a/eatgv.c Fri Apr 02 16:26:10 2010 +0000 +++ b/eatgv.c Sat Apr 03 14:15:00 2010 +0000 @@ -288,11 +288,11 @@ /* 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 -r baf1f1555e92 -r 998691d7f8f5 flacenc.c --- a/flacenc.c Fri Apr 02 16:26:10 2010 +0000 +++ b/flacenc.c Sat Apr 03 14:15:00 2010 +0000 @@ -352,7 +352,7 @@ /* 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 -r baf1f1555e92 -r 998691d7f8f5 gif.c --- a/gif.c Fri Apr 02 16:26:10 2010 +0000 +++ b/gif.c Sat Apr 03 14:15:00 2010 +0000 @@ -133,10 +133,10 @@ 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; }