diff options
| author | Alan Curry <pacman@world.std.com> | 2006-09-05 21:17:30 +0000 |
|---|---|---|
| committer | Roberto Togni <r_togni@tiscali.it> | 2006-09-05 21:17:30 +0000 |
| commit | afd1a2d88e67b5960e8319a6b9fddc4188582604 (patch) | |
| tree | 2a7b09a6c6c650e0c857f0aa8855b60f9e661724 /libavcodec | |
| parent | 2c00106c2b07d38ec90cc9906aef2437df6f1ad7 (diff) | |
| download | ffmpeg-afd1a2d88e67b5960e8319a6b9fddc4188582604.tar.gz | |
Fix buffer handling for stereo mace files, fixes some random sig11
Patch by Alan Curry !<! pacman !@! TheWorld !.! com !>!
Originally committed as revision 6178 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mace.c b/libavcodec/mace.c index a104fb04ed..be50d3d94f 100644 --- a/libavcodec/mace.c +++ b/libavcodec/mace.c @@ -410,18 +410,18 @@ static int mace_decode_frame(AVCodecContext *avctx, #ifdef DEBUG puts("mace_decode_frame[3]()"); #endif - Exp1to3(c, buf, samples, buf_size / 2, avctx->channels, 1); + Exp1to3(c, buf, samples, buf_size / 2 / avctx->channels, avctx->channels, 1); if (avctx->channels == 2) - Exp1to3(c, buf, samples+1, buf_size / 2, 2, 2); + Exp1to3(c, buf, samples+1, buf_size / 2 / 2, 2, 2); *data_size = 2 * 3 * buf_size; break; case CODEC_ID_MACE6: #ifdef DEBUG puts("mace_decode_frame[6]()"); #endif - Exp1to6(c, buf, samples, buf_size, avctx->channels, 1); + Exp1to6(c, buf, samples, buf_size / avctx->channels, avctx->channels, 1); if (avctx->channels == 2) - Exp1to6(c, buf, samples+1, buf_size, 2, 2); + Exp1to6(c, buf, samples+1, buf_size / 2, 2, 2); *data_size = 2 * 6 * buf_size; break; default: |