* commit 'fe99c52f':
  mp3: Properly use AVCodecContext API

Conflicts:
	libavformat/mp3dec.c

See: 6ad42b3e
See: b851bc20Merged-by: Michael Niedermayer <michaelni@gmx.at>