| Index: source/patched-ffmpeg-mt/libavcodec/nellymoserdec.c
|
| ===================================================================
|
| --- source/patched-ffmpeg-mt/libavcodec/nellymoserdec.c (revision 50820)
|
| +++ source/patched-ffmpeg-mt/libavcodec/nellymoserdec.c (working copy)
|
| @@ -166,21 +166,18 @@
|
| if (buf_size < avctx->block_align)
|
| return buf_size;
|
|
|
| - switch (buf_size) {
|
| - case 64: // 8000Hz
|
| - blocks = 1; break;
|
| - case 128: // 11025Hz
|
| - blocks = 2; break;
|
| - case 192: // 16000Hz
|
| - blocks = 3; break;
|
| - case 256: // 22050Hz
|
| - blocks = 4; break;
|
| - case 512: // 44100Hz
|
| - blocks = 8; break;
|
| - default:
|
| - av_log(avctx, AV_LOG_DEBUG, "Tag size %d.\n", buf_size);
|
| - return buf_size;
|
| + if (buf_size % 64) {
|
| + av_log(avctx, AV_LOG_ERROR, "Tag size %d.\n", buf_size);
|
| + return buf_size;
|
| }
|
| + blocks = buf_size / 64;
|
| + /* Normal numbers of blocks for sample rates:
|
| + * 8000 Hz - 1
|
| + * 11025 Hz - 2
|
| + * 16000 Hz - 3
|
| + * 22050 Hz - 4
|
| + * 44100 Hz - 8
|
| + */
|
|
|
| for (i=0 ; i<blocks ; i++) {
|
| nelly_decode_block(s, &buf[i*NELLY_BLOCK_LEN], s->float_buf);
|
|
|