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

Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/scripts/boxset.js

MediaBrowser.Api/Playback/BaseStreamingService.cs

@@ -362,7 +362,7 @@ namespace MediaBrowser.Api.Playback
                 outputSizeParam = "," + outputSizeParam.Substring(outputSizeParam.IndexOf("scale", StringComparison.OrdinalIgnoreCase));
             }
 
-            return string.Format(" -filter_complex \"[0:{0}]format=yuva444p,lut=u=128:v=128:y=gammaval(.3)[sub] ; [0:0] [sub] overlay{1}\"", state.SubtitleStream.Index, outputSizeParam);
+            return string.Format(" -filter_complex \"[0:{0}]format=yuva444p,lut=u=128:v=128:y=gammaval(.3)[sub] ; [0:{1}] [sub] overlay{2}\"", state.SubtitleStream.Index, state.VideoStream.Index, outputSizeParam);
         }
 
         /// <summary>

MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs

@@ -52,7 +52,7 @@ namespace MediaBrowser.Api.UserLibrary
         /// Fields to return within the items, in addition to basic information
         /// </summary>
         /// <value>The fields.</value>
-        [ApiMember(Name = "Fields", Description = "Optional. Specify additional fields of information to return in the output. This allows multiple, comma delimeted. Options: AudioInfo, Chapters, DateCreated, DisplayMediaType, DisplayPreferences, Genres, ItemCounts, IndexOptions, MediaStreams, Overview, OverviewHtml, ParentId, Path, People, ProviderIds, PrimaryImageAspectRatio, SeriesInfo, SortName, Studios, Taglines, TrailerUrls, UserData", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
+        [ApiMember(Name = "Fields", Description = "Optional. Specify additional fields of information to return in the output. This allows multiple, comma delimeted. Options: AudioInfo, Chapters, DateCreated, DisplayMediaType, DisplayPreferences, Genres, ItemCounts, IndexOptions, MediaStreams, Overview, OverviewHtml, ParentId, Path, People, ProviderIds, PrimaryImageAspectRatio, Publishers, SeriesInfo, SortName, Studios, Taglines, TrailerUrls, UserData", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
         public string Fields { get; set; }
     }
 }

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>

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

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

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

@@ -0,0 +1 @@
+33054d71c54e6c262d24d16153c05d45718aeb26

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;

MediaBrowser.Model/Entities/MediaStream.cs

@@ -158,6 +158,10 @@ namespace MediaBrowser.Model.Entities
         /// <summary>
         /// The subtitle
         /// </summary>
-        Subtitle
+        Subtitle,
+        /// <summary>
+        /// The data
+        /// </summary>
+        Data
     }
 }