Merge commit '2e0935965b824bc641b7e0bafafcbb1e36027f79'

* commit '2e0935965b824bc641b7e0bafafcbb1e36027f79':
  Drop the unofficial extension prefix for MPEG and MPEG-TS formats

See: fdcb2873e1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/100/head
Michael Niedermayer 10 years ago
commit ebc29e8625

Diff Content Not Available