summaryrefslogtreecommitdiff
path: root/libavformat/oggenc.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-04-03 14:15:00 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-04-03 14:15:00 +0000
commit2874c81cc80b7f1005073748e8f1877055bf97a7 (patch)
tree4b7f74a856abd49bb61e10caab57c0ffc46667a9 /libavformat/oggenc.c
parent0e642188896c564869bd6446a70e6969b229947d (diff)
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 'libavformat/oggenc.c')
-rw-r--r--libavformat/oggenc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index 10fe20d04c..36ea21cd41 100644
--- 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;