diff options
| author | crobibero <cody@robibe.ro> | 2020-11-20 11:21:24 -0700 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-11-20 11:21:24 -0700 |
| commit | 5b8e248d724ff236747c25d487fd9fa0f7c9d7c3 (patch) | |
| tree | b8d59320bcece305183f588901caba423d0e0e22 /MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | |
| parent | 20dcb7d5c3e492a356ec64d92b2feff7badf97c7 (diff) | |
| parent | d2cef78db3c6f5c1063f8205ed5309f5243be66b (diff) | |
Merge remote-tracking branch 'upstream/master' into video-resolver
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs index 3287f9814..92f16ab95 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs @@ -25,6 +25,7 @@ namespace MediaBrowser.MediaEncoding.Encoder "ac3", "aac", "mp3", + "flac", "h264_qsv", "hevc_qsv", "mpeg2_qsv", @@ -71,6 +72,7 @@ namespace MediaBrowser.MediaEncoding.Encoder "libmp3lame", "libopus", "libvorbis", + "flac", "srt", "h264_amf", "hevc_amf", |