CCF_100/citra
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

audio_core: dsp_hle: add Media Foundation decoder...

Browse Source 
* appveyor: switch to Media Foundation API
* Travis CI MinGW build needs an update with the container image
This commit is contained in:
B3N30
2018-12-19 17:12:57 +01:00
parent 1581dea6de
commit 80b4dd21d2
13 changed files with 839 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@@ -24,13 +24,8 @@ option(ENABLE_FFMPEG "Enable FFmpeg decoder/encoder" OFF)
option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)
<<<<<<< HEAD
=======
option(ENABLE_SCRIPTING "Enables scripting support" OFF)
CMAKE_DEPENDENT_OPTION(ENABLE_MF "Use Media Foundation decoder" ON "WIN32;NOT ENABLE_FFMPEG" OFF)
CMAKE_DEPENDENT_OPTION(CITRA_USE_BUNDLED_FFMPEG "Download bundled FFmpeg binaries" ON "MSVC" OFF)
>>>>>>> CoreAudio::HLE: Add FFmpeg aac decoder
if(NOT EXISTS ${PROJECT_SOURCE_DIR}/.git/hooks/pre-commit)
message(STATUS "Copying pre-commit hook")
file(COPY hooks/pre-commit