Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aacps: Adjust some const qualifiers to suppress warnings

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

diff --cc libavcodec/aacps.c
Simple merge

diff --cc libavcodec/aacps_tablegen.c
Simple merge

diff --cc libavcodec/aacps_tablegen.h
Simple merge

diff --cc libavcodec/aacpsdsp.c
Simple merge

diff --cc libavcodec/aacpsdsp.h
Simple merge