OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3294fc8
)
avcodec/adpcmenc: Use FF_ALLOC_ARRAY_OR_GOTO()
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 10 Sep 2014 12:37:12 +0000
(14:37 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 10 Sep 2014 13:18:29 +0000
(15:18 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/adpcmenc.c
patch
|
blob
|
history
diff --git
a/libavcodec/adpcmenc.c
b/libavcodec/adpcmenc.c
index
06dee35
..
ea6cc23
100644
(file)
--- a/
libavcodec/adpcmenc.c
+++ b/
libavcodec/adpcmenc.c
@@
-509,7
+509,7
@@
static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
/* stereo: 4 bytes (8 samples) for left, 4 bytes for right */
if (avctx->trellis > 0) {
- FF_ALLOC_
OR_GOTO(avctx, buf, avctx->channels *
blocks * 8, error);
+ FF_ALLOC_
ARRAY_OR_GOTO(avctx, buf, avctx->channels,
blocks * 8, error);
for (ch = 0; ch < avctx->channels; ch++) {
adpcm_compress_trellis(avctx, &samples_p[ch][1],
buf + ch * blocks * 8, &c->status[ch],