Merge remote-tracking branch 'shariman/wmall'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 7 Dec 2011 23:37:55 +0000 (00:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 7 Dec 2011 23:37:55 +0000 (00:37 +0100)
commitec8a3e25d8cfed9f8f335b88d8162ae331b68df9
treec6cb7a859e3a20d47464faf86ac6d353a3e8c8ae
parent8e2bab5d4bddb4029503c0f90623854948ddb3c5
parentc5cd2311518bdd6adff8d76a9aa69db00a5514ec
Merge remote-tracking branch 'shariman/wmall'

* shariman/wmall:
  Partially fix CDLMS prediction

Conflicts:
libavcodec/wmalosslessdec.c

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