From 60e0f4d955b7707cb8845c324912c695a8693b16 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 5 Apr 2013 01:03:50 -0400
Subject: fixes #111

---
 MediaBrowser.Controller/Providers/MediaInfo/BaseFFProbeProvider.cs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Providers/MediaInfo/BaseFFProbeProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/BaseFFProbeProvider.cs
index 06af1c8cc..bc8052f0e 100644
--- a/MediaBrowser.Controller/Providers/MediaInfo/BaseFFProbeProvider.cs
+++ b/MediaBrowser.Controller/Providers/MediaInfo/BaseFFProbeProvider.cs
@@ -214,6 +214,10 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
             {
                 stream.Type = MediaStreamType.Subtitle;
             }
+            else if (streamInfo.codec_type.Equals("data", StringComparison.OrdinalIgnoreCase))
+            {
+                stream.Type = MediaStreamType.Data;
+            }
             else
             {
                 stream.Type = MediaStreamType.Video;
-- 
cgit v1.2.3


From 2d7c0ab29c76392d5d8f6b72d27194ee38218643 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 5 Apr 2013 01:07:12 -0400
Subject: updated ffmpeg

---
 MediaBrowser.Controller/MediaBrowser.Controller.csproj              | 2 +-
 MediaBrowser.Controller/MediaInfo/ffmpeg20130327.zip.REMOVED.git-id | 1 -
 MediaBrowser.Controller/MediaInfo/ffmpeg20130405.zip.REMOVED.git-id | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 MediaBrowser.Controller/MediaInfo/ffmpeg20130327.zip.REMOVED.git-id
 create mode 100644 MediaBrowser.Controller/MediaInfo/ffmpeg20130405.zip.REMOVED.git-id

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 8c2895701..2e7a8a994 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -200,9 +200,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="MediaInfo\ffmpeg20130327.zip" />
     <EmbeddedResource Include="MediaInfo\fonts\ARIALUNI.TTF" />
     <EmbeddedResource Include="MediaInfo\fonts\fonts.conf" />
+    <EmbeddedResource Include="MediaInfo\ffmpeg20130405.zip" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/MediaBrowser.Controller/MediaInfo/ffmpeg20130327.zip.REMOVED.git-id b/MediaBrowser.Controller/MediaInfo/ffmpeg20130327.zip.REMOVED.git-id
deleted file mode 100644
index 7eeaacc0a..000000000
--- a/MediaBrowser.Controller/MediaInfo/ffmpeg20130327.zip.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-5e4750e9819a6763ee6a30a36b675ffa846a710b
\ No newline at end of file
diff --git a/MediaBrowser.Controller/MediaInfo/ffmpeg20130405.zip.REMOVED.git-id b/MediaBrowser.Controller/MediaInfo/ffmpeg20130405.zip.REMOVED.git-id
new file mode 100644
index 000000000..363d8552f
--- /dev/null
+++ b/MediaBrowser.Controller/MediaInfo/ffmpeg20130405.zip.REMOVED.git-id
@@ -0,0 +1 @@
+33054d71c54e6c262d24d16153c05d45718aeb26
\ No newline at end of file
-- 
cgit v1.2.3