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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 16 04:01:24 2012 +0100| [28ba1027ec1dea1a55f9e940779f75417ce4798d] | committer: Michael Niedermayer

Merge remote-tracking branch 'shariman/wmall'

* shariman/wmall:
  Do not try to read residue if ave_mean <= 1
  Move some variable declarations to comply with C90
  Cosmetics: fix some whitespace errors
  Support 24-bit decoding
  wmall: remove ;;

Conflicts:
	libavcodec/wmalosslessdec.c

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

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