aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-07-29 21:35:54 -0400
committerGitHub <noreply@github.com>2016-07-29 21:35:54 -0400
commitcb994c3e7abbc49e661b8704e4bdf31a68e6e694 (patch)
tree588e5d4a638235fa2cb3342e733fae0d34276e9d
parentb8da90817568c8cc82db379118dd451e165bfdd7 (diff)
parent267ada923cde90f19f02deca5b6563b95f288bf6 (diff)
Merge pull request #1985 from softworkz/MediaFixes
Fix audio stream for channel media and some minor corrections
-rw-r--r--MediaBrowser.Controller/Channels/ChannelMediaInfo.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/Channels/ChannelMediaInfo.cs b/MediaBrowser.Controller/Channels/ChannelMediaInfo.cs
index 9424568b4..1216ae352 100644
--- a/MediaBrowser.Controller/Channels/ChannelMediaInfo.cs
+++ b/MediaBrowser.Controller/Channels/ChannelMediaInfo.cs
@@ -83,8 +83,7 @@ namespace MediaBrowser.Controller.Channels
{
var list = new List<MediaStream>();
- if (!string.IsNullOrWhiteSpace(info.VideoCodec) &&
- !string.IsNullOrWhiteSpace(info.AudioCodec))
+ if (!string.IsNullOrWhiteSpace(info.VideoCodec))
{
list.Add(new MediaStream
{
@@ -99,7 +98,10 @@ namespace MediaBrowser.Controller.Channels
BitRate = info.VideoBitrate,
AverageFrameRate = info.Framerate
});
+ }
+ if (!string.IsNullOrWhiteSpace(info.AudioCodec))
+ {
list.Add(new MediaStream
{
Type = MediaStreamType.Audio,