FFmpeg/FFmpeg — pull request #70 by flecoz (2014-05-21 13:35:42+00:00)
Title: Fix the mime types for MPEG and MPEG-TS formats

As per the RFCs:
http://tools.ietf.org/html/rfc3555#page-38
http://tools.ietf.org/html/rfc3003