diff options
| author | Bradley Sepos <[email protected]> | 2019-04-12 09:54:46 -0400 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2019-04-12 09:54:56 -0400 |
| commit | 24563ab804d03af5f52683927676b9eda8362813 (patch) | |
| tree | c2a9cfddecded13444043a4150604eb5e21b5e1e /make/configure.py | |
| parent | cc39a90413c0be3466bc4d51a11a36cbfb4509b4 (diff) | |
make: Require FFmpeg AAC on Linux and Windows.
FFmpeg AAC was originally disabled when FDK enabled, but this did not seem to work correctly. When I "fixed" the issuein 7b035348b714f945cff1ae2940332960a8eb0f00, WinGUI started throwing exceptions. This should fix the problem for now.
Diffstat (limited to 'make/configure.py')
| -rw-r--r-- | make/configure.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/make/configure.py b/make/configure.py index d25400e38..39ebf46d2 100644 --- a/make/configure.py +++ b/make/configure.py @@ -1859,9 +1859,10 @@ int main() doc.addBlank() doc.add( 'FEATURE.asm', 'disabled' ) - # Disable FFmpeg AAC where FDK AAC is enabled - options.enable_ffmpeg_aac = False if options.enable_fdk_aac else options.enable_ffmpeg_aac doc.add( 'FEATURE.fdk_aac', int( options.enable_fdk_aac )) + + # Require FFmpeg AAC on Linux and Windows + options.enable_ffmpeg_aac = True if build.system != 'darwin' else options.enable_ffmpeg_aac doc.add( 'FEATURE.ffmpeg_aac', int( options.enable_ffmpeg_aac )) doc.add( 'FEATURE.flatpak', int( options.flatpak )) |