Merge commit '2e0935965b824bc641b7e0bafafcbb1e36027f79'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 21:55:14 +0000 (22:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Dec 2014 21:56:07 +0000 (22:56 +0100)
* commit '2e0935965b824bc641b7e0bafafcbb1e36027f79':
  Drop the unofficial extension prefix for MPEG and MPEG-TS formats

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

Trivial merge