* commit '32d05934':
  mp3dec: decode more data from Info header

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