generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix buffer handling for stereo mace files, fixes some random sig11

Browse Source 
Patch by Alan Curry !<! pacman !@! TheWorld !.! com !>!

Originally committed as revision 6178 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alan Curry 2006-09-05 21:17:30 +00:00 committed by Roberto Togni
parent 2c00106c2b
commit afd1a2d88e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mace.c
View File

@ -410,18 +410,18 @@ static int mace_decode_frame(AVCodecContext *avctx,
#ifdef DEBUG #ifdef DEBUG
puts("mace_decode_frame[3]()"); puts("mace_decode_frame[3]()");
#endif #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) 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; *data_size = 2 * 3 * buf_size;
break; break;
case CODEC_ID_MACE6: case CODEC_ID_MACE6:
#ifdef DEBUG #ifdef DEBUG
puts("mace_decode_frame[6]()"); puts("mace_decode_frame[6]()");
#endif #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) 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; *data_size = 2 * 6 * buf_size;
break; break;
default: default: