Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

MediaBrowser.Controller/MediaBrowser.Controller.csproj

@@ -200,7 +200,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="MediaInfo\ffmpeg20130310.zip" />
+    <EmbeddedResource Include="MediaInfo\ffmpeg20130327.zip" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

MediaBrowser.Controller/MediaInfo/ffmpeg20130310.zip.REMOVED.git-id

@@ -1 +0,0 @@
-8e635e6882f3482f3cabbfbf42b76e2c9d24678a

MediaBrowser.Controller/MediaInfo/ffmpeg20130327.zip.REMOVED.git-id

@@ -0,0 +1 @@
+5e4750e9819a6763ee6a30a36b675ffa846a710b