# HG changeset patch # User bcoudurier # Date 1186321304 0 # Node ID c2512a13877e278afe3130fbf50bf2a8b1d3bea2 # Parent 80b481ec72a667eb741be962bb75c8559b5ca393 fix decoding of adpcm swf big frames, fix RamboMJPEGAVP6_1Mbps.swf diff -r 80b481ec72a6 -r c2512a13877e adpcm.c --- a/adpcm.c Sun Aug 05 12:11:34 2007 +0000 +++ b/adpcm.c Sun Aug 05 13:41:44 2007 +0000 @@ -1274,7 +1274,7 @@ { GetBitContext gb; const int *table; - int k0, signmask, nb_bits; + int k0, signmask, nb_bits, count; int size = buf_size*8; init_get_bits(&gb, buf, size); @@ -1286,12 +1286,13 @@ k0 = 1 << (nb_bits-2); signmask = 1 << (nb_bits-1); + while (get_bits_count(&gb) <= size - 22*avctx->channels) { for (i = 0; i < avctx->channels; i++) { *samples++ = c->status[i].predictor = get_sbits(&gb, 16); c->status[i].step_index = get_bits(&gb, 6); } - while (get_bits_count(&gb) < size) + for (count = 0; get_bits_count(&gb) <= size - nb_bits*avctx->channels && count < 4095; count++) { int i; @@ -1327,6 +1328,7 @@ } } } + } src += buf_size; break; }