diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-08-04 16:30:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-04 16:30:15 -0400 |
| commit | e169eaee6cb2f91e4102f4fe7ac9075659feba95 (patch) | |
| tree | a143a29cc50b65fd059727ad8f687ad32e42cecb /MediaBrowser.Providers | |
| parent | db9176521c324452ea6c4c4566d54eed5329780f (diff) | |
| parent | 3fe1c25c3ea8d6519aba3b5c3ef0d6a9154413b2 (diff) | |
Merge pull request #2794 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Providers')
| -rw-r--r-- | MediaBrowser.Providers/MediaInfo/FFProbeAudioInfo.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeAudioInfo.cs b/MediaBrowser.Providers/MediaInfo/FFProbeAudioInfo.cs index 04e549526..12d1d3468 100644 --- a/MediaBrowser.Providers/MediaInfo/FFProbeAudioInfo.cs +++ b/MediaBrowser.Providers/MediaInfo/FFProbeAudioInfo.cs @@ -95,14 +95,14 @@ namespace MediaBrowser.Providers.MediaInfo { var mediaStreams = mediaInfo.MediaStreams; - //audio.FormatName = mediaInfo.Container; + audio.Container = mediaInfo.Container; audio.TotalBitrate = mediaInfo.Bitrate; audio.RunTimeTicks = mediaInfo.RunTimeTicks; audio.Size = mediaInfo.Size; var extension = (Path.GetExtension(audio.Path) ?? string.Empty).TrimStart('.'); - audio.Container = extension; + //audio.Container = extension; await FetchDataFromTags(audio, mediaInfo).ConfigureAwait(false); diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs index eaf3505d1..06267f33a 100644 --- a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs +++ b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs @@ -187,6 +187,7 @@ namespace MediaBrowser.Providers.MediaInfo { video.Container = null; } + video.Container = mediaInfo.Container; var chapters = mediaInfo.Chapters ?? new List<ChapterInfo>(); if (blurayInfo != null) |