aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-08-16 10:09:29 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-08-16 10:09:29 -0400
commit1a2ff21b443a021869058d73305993c46c27916c (patch)
tree583ac77564a83507e864a6aa3a1fdfcafe3c3d94
parent11c37780531791a898afd36bc186b4b60d1dce9b (diff)
added stream copy options
-rw-r--r--MediaBrowser.Api/Playback/BaseStreamingService.cs2
-rw-r--r--MediaBrowser.Model/Dto/StreamOptions.cs12
2 files changed, 11 insertions, 3 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index b4ba31d72..f15986bbb 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -817,7 +817,7 @@ namespace MediaBrowser.Api.Playback
return VideoCodecs.H264;
}
- return null;
+ return VideoCodecs.Copy;
}
}
}
diff --git a/MediaBrowser.Model/Dto/StreamOptions.cs b/MediaBrowser.Model/Dto/StreamOptions.cs
index d9c34f9b1..b9f2dbe4a 100644
--- a/MediaBrowser.Model/Dto/StreamOptions.cs
+++ b/MediaBrowser.Model/Dto/StreamOptions.cs
@@ -155,7 +155,11 @@
/// <summary>
/// The wma
/// </summary>
- Wma
+ Wma,
+ /// <summary>
+ /// The copy
+ /// </summary>
+ Copy
}
/// <summary>
@@ -188,6 +192,10 @@
/// <summary>
/// The WMV
/// </summary>
- Wmv
+ Wmv,
+ /// <summary>
+ /// The copy
+ /// </summary>
+ Copy
}
}