Michael Niedermayer 44fb7de8ee Merge commit 'c0779a67e85df856904ee6fab760c4233d4c2be5' ...

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

Conflicts:
	libavformat/mp3dec.c

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

2013-09-12 15:02:23 +02:00

11 KiB

Raw Blame History

View Raw