[FFmpeg-cvslog] Merge commit 'c0779a67e85df856904ee6fab760c4233d4c2be5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 12 15:02:23 2013 +0200| [44fb7de8ee6d344ce18d7b4c5d906da6c2c541cf] | committer: Michael Niedermayer

Merge commit 'c0779a67e85df856904ee6fab760c4233d4c2be5'

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

Conflicts:
	libavformat/mp3dec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44fb7de8ee6d344ce18d7b4c5d906da6c2c541cf
---