diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 20:31:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 20:31:29 +0100 |
| commit | 8c677a9f06c5d145da0301cdc3c6bff9ebacb5d7 (patch) | |
| tree | 9c756ade47cc06771cb120f53b5f9c22724717f6 /libavcodec/eatgv.c | |
| parent | 94a849b8b6c3e4a90361485b2e12a9a5c35833a3 (diff) | |
| parent | 9b8d11a76ae7bca8bbb58abb822138f8b42c776c (diff) | |
Merge commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c'
* commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c':
avcodec: Use av_reallocp where suitable
Conflicts:
libavcodec/bitstream.c
libavcodec/eatgv.c
libavcodec/flashsv.c
libavcodec/libtheoraenc.c
libavcodec/libvpxenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/eatgv.c')
| -rw-r--r-- | libavcodec/eatgv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c index 9344b0ff9f..952ebb3c34 100644 --- a/libavcodec/eatgv.c +++ b/libavcodec/eatgv.c @@ -181,9 +181,10 @@ static int tgv_decode_inter(TgvContext *s, AVFrame *frame, } if (num_blocks_packed > s->num_blocks_packed) { - if (av_reallocp_array(&s->block_codebook, num_blocks_packed, sizeof(*s->block_codebook))) { + int err; + if ((err = av_reallocp(&s->block_codebook, num_blocks_packed * 16)) < 0) { s->num_blocks_packed = 0; - return AVERROR(ENOMEM); + return err; } s->num_blocks_packed = num_blocks_packed; } |