[FFmpeg-cvslog] Merge commit '2e0935965b824bc641b7e0bafafcbb1e36027f79'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Dec  2 22:55:14 2014 +0100| [ebc29e8625b0c3f9c39e2b1fb17a5eab2c939c49] | committer: Michael Niedermayer

Merge commit '2e0935965b824bc641b7e0bafafcbb1e36027f79'

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

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

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