* qatar/master:
  aac: return meaningful errors

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