* commit 'c0779a67':
  mp3: add .mpa extension

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