diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-06-26 12:22:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-26 12:22:21 -0400 |
| commit | f177ef39725e39fb0c84ce413f07fcc2eaaf79df (patch) | |
| tree | 6f48b25eab250fdc388b6900ecfa0bee7d9d74dd /MediaBrowser.Dlna | |
| parent | a1ad61ff8db3739098b7a97a4d0adc0c034ddcfb (diff) | |
| parent | 5c5cc212aa7e3d9a4c595e22ce6b54717afe3d3d (diff) | |
Merge pull request #1880 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Dlna')
| -rw-r--r-- | MediaBrowser.Dlna/Didl/DidlBuilder.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Dlna/PlayTo/PlayToController.cs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/MediaBrowser.Dlna/Didl/DidlBuilder.cs b/MediaBrowser.Dlna/Didl/DidlBuilder.cs index b28cffd6d6..0a15491b67 100644 --- a/MediaBrowser.Dlna/Didl/DidlBuilder.cs +++ b/MediaBrowser.Dlna/Didl/DidlBuilder.cs @@ -160,7 +160,7 @@ namespace MediaBrowser.Dlna.Didl var contentFeatureList = new ContentFeatureBuilder(_profile).BuildVideoHeader(streamInfo.Container, streamInfo.VideoCodec, - streamInfo.AudioCodec, + streamInfo.TargetAudioCodec, targetWidth, targetHeight, streamInfo.TargetVideoBitDepth, @@ -307,7 +307,7 @@ namespace MediaBrowser.Dlna.Didl } var mediaProfile = _profile.GetVideoMediaProfile(streamInfo.Container, - streamInfo.AudioCodec, + streamInfo.TargetAudioCodec, streamInfo.VideoCodec, streamInfo.TargetAudioBitrate, targetWidth, @@ -441,7 +441,7 @@ namespace MediaBrowser.Dlna.Didl } var mediaProfile = _profile.GetAudioMediaProfile(streamInfo.Container, - streamInfo.AudioCodec, + streamInfo.TargetAudioCodec, targetChannels, targetAudioBitrate); diff --git a/MediaBrowser.Dlna/PlayTo/PlayToController.cs b/MediaBrowser.Dlna/PlayTo/PlayToController.cs index 982742c067..873ae5ae41 100644 --- a/MediaBrowser.Dlna/PlayTo/PlayToController.cs +++ b/MediaBrowser.Dlna/PlayTo/PlayToController.cs @@ -499,7 +499,7 @@ namespace MediaBrowser.Dlna.PlayTo { return new ContentFeatureBuilder(profile) .BuildAudioHeader(streamInfo.Container, - streamInfo.AudioCodec, + streamInfo.TargetAudioCodec, streamInfo.TargetAudioBitrate, streamInfo.TargetAudioSampleRate, streamInfo.TargetAudioChannels, @@ -513,7 +513,7 @@ namespace MediaBrowser.Dlna.PlayTo var list = new ContentFeatureBuilder(profile) .BuildVideoHeader(streamInfo.Container, streamInfo.VideoCodec, - streamInfo.AudioCodec, + streamInfo.TargetAudioCodec, streamInfo.TargetWidth, streamInfo.TargetHeight, streamInfo.TargetVideoBitDepth, |