1 files changed, 17 insertions, 2 deletions
diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
index cdaa99130..54d441dc5 100644
--- a/MediaBrowser.Api/Playback/Progressive/VideoService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
@@ -11,7 +11,6 @@ using MediaBrowser.Model.IO;
 using ServiceStack;
 using System;
 using System.IO;
-using System.Threading;
 
 namespace MediaBrowser.Api.Playback.Progressive
 {
@@ -50,6 +49,12 @@ namespace MediaBrowser.Api.Playback.Progressive
     [Route("/Videos/{Id}/stream.wtv", "HEAD")]
     [Route("/Videos/{Id}/stream.m2ts", "HEAD")]
     [Route("/Videos/{Id}/stream", "HEAD")]
+    [Route("/Videos/{Id}/stream.mp4", "OPTIONS")]
+    [Route("/Videos/{Id}/stream.m4v", "OPTIONS")]
+    [Route("/Videos/{Id}/stream.mkv", "OPTIONS")]
+    [Route("/Videos/{Id}/stream.avi", "OPTIONS")]
+    [Route("/Videos/{Id}/stream.webm", "OPTIONS")]
+    [Route("/Videos/{Id}/stream.ts", "OPTIONS")]
     [Api(Description = "Gets a video stream")]
     public class GetVideoStream : VideoStreamRequest
     {
@@ -86,6 +91,16 @@ namespace MediaBrowser.Api.Playback.Progressive
         }
 
         /// <summary>
+        /// Optionses the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>System.Object.</returns>
+        public object Options(GetVideoStream request)
+        {
+            return ProcessRequest(request, true);
+        }
+
+        /// <summary>
         /// Gets the command line arguments.
         /// </summary>
         /// <param name="outputPath">The output path.</param>
@@ -154,7 +169,7 @@ namespace MediaBrowser.Api.Playback.Progressive
             // Add resolution params, if specified
             if (!hasGraphicalSubs)
             {
-                args += GetOutputSizeParam(state, codec, CancellationToken.None);
+                args += GetOutputSizeParam(state, codec);
             }
 
             var qualityParam = GetVideoQualityParam(state, codec, false);