Merge remote-tracking branch 'shariman/wmall'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 16 Feb 2012 03:01:24 +0000 (04:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 16 Feb 2012 03:01:24 +0000 (04:01 +0100)
commit28ba1027ec1dea1a55f9e940779f75417ce4798d
treefb1b3486384c9758c5d9e52697b54099edd83958
parent7606825350a64ad1c2365a74cac8a5e586f39ff6
parentd1ea26f6407e8bf52da1e36a99c4d9bbb14fb1fb
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@gmx.at>
libavcodec/wmalosslessdec.c