* 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>