Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Nov 2013 01:15:47 +0000 (02:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Nov 2013 01:15:47 +0000 (02:15 +0100)
commita9a3afec1a9c57a344f4ec09b6ba3db338a3c8bc
tree6a103ce61a49221879e4d4d1202c4b6c38f13304
parentf1db007e008d3ece791c7ac65c537d1d301ea0cc
parent5145ccf02b1771233c1b33b5bd20a8bd94a3c15c
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aacsbr: Add some const casts to silence warnings in ff_sbr_apply()

Conflicts:
libavcodec/aacsbr.c

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