mirror of
https://github.com/nyanmisaka/ffmpeg-rockchip.git
synced 2025-12-24 11:52:06 +08:00
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
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user