From 2874c81cc80b7f1005073748e8f1877055bf97a7 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Sat, 3 Apr 2010 14:15:00 +0000 Subject: 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 --- libavformat/rtpdec_xiph.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libavformat/rtpdec_xiph.c') diff --git a/libavformat/rtpdec_xiph.c b/libavformat/rtpdec_xiph.c index 302f9858d3..1c6eef7d9e 100644 --- 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)) { -- cgit v1.2.3