Originally committed as revision 18467 to svn://svn.ffmpeg.org/ffmpeg/trunk
Unified · Split
| @@ -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 | ||
| @@ -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, |