History

Use AVERROR(ENOMEM) instead of AVERROR_NOMEM / -1 in eatqi and mimic decoders

Originally committed as revision 18467 to svn://svn.ffmpeg.org/ffmpeg/trunk

Reimar Döffinger committed 17 years ago

Commit 55775b01 parent 53bd67e2 files · +2 −2Browse files

Unified · Split

2 files
  1. libavcodec/eatqi.c +1 −1
  2. libavcodec/mimic.c +1 −1
libavcodec/eatqi.c+1−1
@@ -128,7 +128,7 @@ static int tqi_decode_frame(AVCodecContext *avctx, · 127 unmodified lines
128 128
129 t->bitstream_buf = av_fast_realloc(t->bitstream_buf, &t->bitstream_buf_size, (buf_end-buf) + FF_INPUT_BUFFER_PADDING_SIZE);129 t->bitstream_buf = av_fast_realloc(t->bitstream_buf, &t->bitstream_buf_size, (buf_end-buf) + FF_INPUT_BUFFER_PADDING_SIZE);
130 if (!t->bitstream_buf)130 if (!t->bitstream_buf)
131 return -1;131 return AVERROR(ENOMEM);
132 s->dsp.bswap_buf((uint32_t*)t->bitstream_buf, (const uint32_t*)buf, (buf_end-buf)/4);132 s->dsp.bswap_buf((uint32_t*)t->bitstream_buf, (const uint32_t*)buf, (buf_end-buf)/4);
133 init_get_bits(&s->gb, t->bitstream_buf, 8*(buf_end-buf));133 init_get_bits(&s->gb, t->bitstream_buf, 8*(buf_end-buf));
134 134
libavcodec/mimic.c+1−1
@@ -337,7 +337,7 @@ static int mimic_decode_frame(AVCodecContext *avctx, void *data, · 336 unmodified lines
337 ctx->swap_buf = av_fast_realloc(ctx->swap_buf, &ctx->swap_buf_size,337 ctx->swap_buf = av_fast_realloc(ctx->swap_buf, &ctx->swap_buf_size,
338 swap_buf_size + FF_INPUT_BUFFER_PADDING_SIZE);338 swap_buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
339 if(!ctx->swap_buf)339 if(!ctx->swap_buf)
340 return AVERROR_NOMEM;340 return AVERROR(ENOMEM);
341 341
342 ctx->dsp.bswap_buf((uint32_t*)ctx->swap_buf,342 ctx->dsp.bswap_buf((uint32_t*)ctx->swap_buf,
343 (const uint32_t*) buf,343 (const uint32_t*) buf,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t