]> git.sesse.net Git - ffmpeg/commit
Merge remote-tracking branch 'shariman/wmall'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 24 Dec 2011 00:54:25 +0000 (01:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 24 Dec 2011 00:54:25 +0000 (01:54 +0100)
commit28dff061767727ecf98335fe2814c06297723fde
tree5d5aced16d5f15099c62b3f98590e4fb8ff7cc87
parent0d30c95394cf0f844dbaa7090acc87b9e3d726af
parent70dd5a603cb9d1e7ba00640afa2da52ce5fabf3e
Merge remote-tracking branch 'shariman/wmall'

* shariman/wmall:
  Perform dequantization of channel coefficients
  Perform inverse inter-channel decorrelation and ac-filter
  Implement revert_inter_ch_decorr() and revert_acfilter()
  Enable inverse-MCLMS filter
  Fix inverse-MCLMS filtering routines
  Do not update buffers in case no speed change is necessary
  Use int for channel_coeffs instead of int16_t

Conflicts:
libavcodec/wmalosslessdec.c

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