Merge commit 'c0779a67e85df856904ee6fab760c4233d4c2be5'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Sep 2013 13:02:23 +0000 (15:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Sep 2013 13:02:23 +0000 (15:02 +0200)
* commit 'c0779a67e85df856904ee6fab760c4233d4c2be5':
  mp3: add .mpa extension

Conflicts:
libavformat/mp3dec.c

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

@@@ -360,6 -282,5 +360,6 @@@ AVInputFormat ff_mp3_demuxer = 
      .read_seek      = mp3_seek,
      .priv_data_size = sizeof(MP3DecContext),
      .flags          = AVFMT_GENERIC_INDEX,
-     .extensions     = "mp2,mp3,m2a", /* XXX: use probe */
+     .extensions     = "mp2,mp3,m2a,mpa", /* XXX: use probe */
 +    .priv_class     = &demuxer_class,
  };
Simple merge