diff options
| author | David <daullmer@gmail.com> | 2020-07-21 10:32:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-21 10:32:05 +0200 |
| commit | 5b57c81ee14ce585161b9ac331e6e3528826b815 (patch) | |
| tree | 762c571faa5715ffd0062b790099b1113faccc37 /MediaBrowser.Controller/Extensions | |
| parent | 352dab701866b37d0dd5dcaa6343ccc256d7e837 (diff) | |
| parent | 5c66f9e4716961dc40e0444c7d261dfd2e5841d7 (diff) | |
Merge pull request #3629 from crobibero/api-migration-merge
Api migration merge
Diffstat (limited to 'MediaBrowser.Controller/Extensions')
| -rw-r--r-- | MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Extensions/StringExtensions.cs | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs b/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs index c0043c0ef..c2932cc4c 100644 --- a/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs +++ b/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs @@ -24,6 +24,11 @@ namespace MediaBrowser.Controller.Extensions public const string FfmpegAnalyzeDurationKey = "FFmpeg:analyzeduration"; /// <summary> + /// The key for the FFmpeg path option. + /// </summary> + public const string FfmpegPathKey = "ffmpeg"; + + /// <summary> /// The key for a setting that indicates whether playlists should allow duplicate entries. /// </summary> public const string PlaylistsAllowDuplicatesKey = "playlists:allowDuplicates"; diff --git a/MediaBrowser.Controller/Extensions/StringExtensions.cs b/MediaBrowser.Controller/Extensions/StringExtensions.cs index b1aaf6534..e09543e14 100644 --- a/MediaBrowser.Controller/Extensions/StringExtensions.cs +++ b/MediaBrowser.Controller/Extensions/StringExtensions.cs @@ -7,7 +7,7 @@ using System.Text.RegularExpressions; namespace MediaBrowser.Controller.Extensions { /// <summary> - /// Class BaseExtensions + /// Class BaseExtensions. /// </summary> public static class StringExtensions { |