diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-10-05 14:12:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-05 14:12:16 -0400 |
| commit | 8eeca98fef6dd314764882b0ea1121361ec11e46 (patch) | |
| tree | b6e5d8074e9d4326729f13ec5562277cf2845ea4 /MediaBrowser.Controller | |
| parent | 185fa7f5e76a9971e34c35783698d37902ed14cb (diff) | |
| parent | db01b79901e503350f8359cab8b1eeae5ea30735 (diff) | |
Merge pull request #2943 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Providers/MetadataResult.cs | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 8b612f809..004748a76 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -1960,6 +1960,12 @@ namespace MediaBrowser.Controller.MediaEncoding return "-c:v h264_mmal"; } break; + case "mpeg2video": + if (_mediaEncoder.SupportsDecoder("mpeg2_mmal") && encodingOptions.HardwareDecodingCodecs.Contains("mpeg2video", StringComparer.OrdinalIgnoreCase)) + { + return "-c:v mpeg2_mmal"; + } + break; } } } diff --git a/MediaBrowser.Controller/Providers/MetadataResult.cs b/MediaBrowser.Controller/Providers/MetadataResult.cs index 5ed55ea16..f35d41ca4 100644 --- a/MediaBrowser.Controller/Providers/MetadataResult.cs +++ b/MediaBrowser.Controller/Providers/MetadataResult.cs @@ -20,6 +20,7 @@ namespace MediaBrowser.Controller.Providers public bool HasMetadata { get; set; } public T Item { get; set; } public string ResultLanguage { get; set; } + public string Provider { get; set; } public bool QueriedById { get; set; } public void AddPerson(PersonInfo p) { |