diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-10-12 14:32:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-12 14:32:22 -0400 |
| commit | a6f0ceb78bc7ca28303bd989a4889ba6b83b05f4 (patch) | |
| tree | c24de2b4615bde51ebe8c54ea5c6cb19068effd9 /MediaBrowser.Model | |
| parent | b802a6320e9acf7f5025d6de7c72e8b8df448a28 (diff) | |
| parent | 038b11702ec1cdafd49e31deaaf219f8b4d1313e (diff) | |
Merge pull request #2222 from MediaBrowser/dev
update playlist content
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Dto/BaseItemDto.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/LiveTv/LiveTvOptions.cs | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs index 33aa8bb1c8..9267222adf 100644 --- a/MediaBrowser.Model/Dto/BaseItemDto.cs +++ b/MediaBrowser.Model/Dto/BaseItemDto.cs @@ -789,8 +789,6 @@ namespace MediaBrowser.Model.Dto /// <value>The home page URL.</value> public string HomePageUrl { get; set; } - public string PlaceOfBirth { get; set; } - /// <summary> /// Gets or sets the budget. /// </summary> diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs index a6240afe6d..ee7dd8b985 100644 --- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs +++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs @@ -60,6 +60,7 @@ namespace MediaBrowser.Model.LiveTv public TunerHostInfo() { IsEnabled = true; + AllowHWTranscoding = true; } } |