* commit '462d5e8e':
  aacdec: set AVFrame sample_rate

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