Merge remote-tracking branch 'shariman/wmall'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 7 Dec 2011 03:49:42 +0000 (04:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 7 Dec 2011 03:49:42 +0000 (04:49 +0100)
commit1fa8ff38e47b3e0fc63e2a2e8fbbcf9e4fb071c5
tree760cd8bd363574c402bacaaff0cf4f4a5bfb1b61
parent76d7d1b0bd64ea5b6bd243d8b8d8dad156ae0bce
parent460bec6800f6229b664297a6c83a5ef4f0701221
Merge remote-tracking branch 'shariman/wmall'

* shariman/wmall:
  Fix lms_update()
  Move num_lms reading out of a loop
  Use correct value for range
  Fix some int / int16_t / int32_t confusion
  Implement revert_mclms() and associated functions
  Fix two more int16_t vs. int confusion
  Init s->cdlms[][].recent to order - 1
  Add a size argument to dump_int_buffer()
  Get rid of logging that are not required anymore
  Fix some int vs. int16_t confusion

Conflicts:
libavcodec/wmalosslessdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/wmalosslessdec.c