diff options
| author | nyanmisaka <nst799610810@gmail.com> | 2020-11-20 10:01:17 +0800 |
|---|---|---|
| committer | nyanmisaka <nst799610810@gmail.com> | 2020-11-20 10:01:17 +0800 |
| commit | b4598bd71b1e2cab057a73cf5daa5ba88ded6625 (patch) | |
| tree | 9e4b7bbf35909070ced6d04d1dc7c1f9d22478cd /MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | |
| parent | ca33ace3e97a85c01848db072708a4e2cf0b251a (diff) | |
| parent | 90e4066b12e3b39124f9f4efcb20a0e51499a038 (diff) | |
Merge remote-tracking branch 'upstream/master' into fmp4-hls
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", |