diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-04-03 14:15:00 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-04-03 14:15:00 +0000 |
| commit | 2874c81cc80b7f1005073748e8f1877055bf97a7 (patch) | |
| tree | 4b7f74a856abd49bb61e10caab57c0ffc46667a9 /libavcodec | |
| parent | 0e642188896c564869bd6446a70e6969b229947d (diff) | |
| download | ffmpeg-2874c81cc80b7f1005073748e8f1877055bf97a7.tar.gz | |
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
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ac3dec.c | 2 | ||||
| -rw-r--r-- | libavcodec/eatgv.c | 4 | ||||
| -rw-r--r-- | libavcodec/flacenc.c | 2 | ||||
| -rw-r--r-- | libavcodec/gif.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 9b1aeeceaa..182e4fbcb0 100644 --- 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 ce0be4bae7..e5a908ea21 100644 --- 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 33d8133a37..89d40d5ac2 100644 --- 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 c04f8bbc1d..5114b89226 100644 --- 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; } |