diff options
| author | Techywarrior <techywarrior@gmail.com> | 2013-04-04 22:27:27 -0700 |
|---|---|---|
| committer | Techywarrior <techywarrior@gmail.com> | 2013-04-04 22:27:27 -0700 |
| commit | ddf464720e879ff2fa75a843bbb362651c5ef2a7 (patch) | |
| tree | f435395fec9448d44aba16b8ee690e86252db8d2 /MediaBrowser.Controller | |
| parent | be710018c5718c6b16022bb6b29b1e3f8b350b62 (diff) | |
| parent | 2d7c0ab29c76392d5d8f6b72d27194ee38218643 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts:
MediaBrowser.WebDashboard/dashboard-ui/scripts/boxset.js
Diffstat (limited to 'MediaBrowser.Controller')
4 files changed, 6 insertions, 2 deletions
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 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; |