UniversalMediaServer/UniversalMediaServer — pull request #17 by glebb (2012-09-01 06:32:31+00:00)
Title: Muxing on osx

Reverted two commits, which broke muxing with tsmuxer and ffmpeg on OSX.

tsmuxer: Removed redundant MEncoder arguments
ffmpeg: Removed unecessary FFmpeg and MEncoder commands