[FFmpeg-cvslog] Merge remote-tracking branch 'shariman/wmall'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec  8 00:37:55 2011 +0100| [ec8a3e25d8cfed9f8f335b88d8162ae331b68df9] | committer: Michael Niedermayer

Merge remote-tracking branch 'shariman/wmall'

* shariman/wmall:
  Partially fix CDLMS prediction

Conflicts:
	libavcodec/wmalosslessdec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ec8a3e25d8cfed9f8f335b88d8162ae331b68df9
---