Skip to content
Permalink
Browse files
windows: move ffmpeg bins to submodule 
udpate ffmpeg to b1cbeabf5e4b3234e895a58bafa371bfb792baf0
enable ffmpeg on arm64
  • Loading branch information
@shuffle2
shuffle2 committed Mar 30, 2022
1 parent 0204b11 commit 09432ef098e1ce0d37b6d7d66b144e3679df72ce
Showing with 25 additions and 26,081 deletions.
  1. +5 −0 .gitmodules
  2. +6 −2 CMakeLists.txt
  3. +1 −0 Externals/FFmpeg-bin
  4. +0 −6,241 Externals/ffmpeg/include/libavcodec/avcodec.h
  5. +0 −84 Externals/ffmpeg/include/libavcodec/avdct.h
  6. +0 −118 Externals/ffmpeg/include/libavcodec/avfft.h
  7. +0 −112 Externals/ffmpeg/include/libavcodec/d3d11va.h
  8. +0 −131 Externals/ffmpeg/include/libavcodec/dirac.h
  9. +0 −83 Externals/ffmpeg/include/libavcodec/dv_profile.h
  10. +0 −93 Externals/ffmpeg/include/libavcodec/dxva2.h
  11. +0 −46 Externals/ffmpeg/include/libavcodec/jni.h
  12. +0 −88 Externals/ffmpeg/include/libavcodec/mediacodec.h
  13. +0 −107 Externals/ffmpeg/include/libavcodec/qsv.h
  14. +0 −189 Externals/ffmpeg/include/libavcodec/vaapi.h
  15. +0 −230 Externals/ffmpeg/include/libavcodec/vda.h
  16. +0 −253 Externals/ffmpeg/include/libavcodec/vdpau.h
  17. +0 −230 Externals/ffmpeg/include/libavcodec/version.h
  18. +0 −126 Externals/ffmpeg/include/libavcodec/videotoolbox.h
  19. +0 −77 Externals/ffmpeg/include/libavcodec/vorbis_parser.h
  20. +0 −170 Externals/ffmpeg/include/libavcodec/xvmc.h
  21. +0 −2,978 Externals/ffmpeg/include/libavformat/avformat.h
  22. +0 −801 Externals/ffmpeg/include/libavformat/avio.h
  23. +0 −92 Externals/ffmpeg/include/libavformat/version.h
  24. +0 −60 Externals/ffmpeg/include/libavutil/adler32.h
  25. +0 −65 Externals/ffmpeg/include/libavutil/aes.h
  26. +0 −83 Externals/ffmpeg/include/libavutil/aes_ctr.h
  27. +0 −168 Externals/ffmpeg/include/libavutil/attributes.h
  28. +0 −187 Externals/ffmpeg/include/libavutil/audio_fifo.h
  29. +0 −75 Externals/ffmpeg/include/libavutil/avassert.h
  30. +0 −6 Externals/ffmpeg/include/libavutil/avconfig.h
  31. +0 −402 Externals/ffmpeg/include/libavutil/avstring.h
  32. +0 −345 Externals/ffmpeg/include/libavutil/avutil.h
  33. +0 −72 Externals/ffmpeg/include/libavutil/base64.h
  34. +0 −82 Externals/ffmpeg/include/libavutil/blowfish.h
  35. +0 −219 Externals/ffmpeg/include/libavutil/bprint.h
  36. +0 −109 Externals/ffmpeg/include/libavutil/bswap.h
  37. +0 −290 Externals/ffmpeg/include/libavutil/buffer.h
  38. +0 −70 Externals/ffmpeg/include/libavutil/camellia.h
  39. +0 −80 Externals/ffmpeg/include/libavutil/cast5.h
  40. +0 −223 Externals/ffmpeg/include/libavutil/channel_layout.h
  41. +0 −530 Externals/ffmpeg/include/libavutil/common.h
  42. +0 −117 Externals/ffmpeg/include/libavutil/cpu.h
  43. +0 −103 Externals/ffmpeg/include/libavutil/crc.h
  44. +0 −77 Externals/ffmpeg/include/libavutil/des.h
  45. +0 −200 Externals/ffmpeg/include/libavutil/dict.h
  46. +0 −87 Externals/ffmpeg/include/libavutil/display.h
  47. +0 −115 Externals/ffmpeg/include/libavutil/downmix_info.h
  48. +0 −126 Externals/ffmpeg/include/libavutil/error.h
  49. +0 −113 Externals/ffmpeg/include/libavutil/eval.h
  50. +0 −5 Externals/ffmpeg/include/libavutil/ffversion.h
  51. +0 −179 Externals/ffmpeg/include/libavutil/fifo.h
  52. +0 −69 Externals/ffmpeg/include/libavutil/file.h
  53. +0 −755 Externals/ffmpeg/include/libavutil/frame.h
  54. +0 −263 Externals/ffmpeg/include/libavutil/hash.h
  55. +0 −100 Externals/ffmpeg/include/libavutil/hmac.h
  56. +0 −429 Externals/ffmpeg/include/libavutil/hwcontext.h
  57. +0 −46 Externals/ffmpeg/include/libavutil/hwcontext_cuda.h
  58. +0 −72 Externals/ffmpeg/include/libavutil/hwcontext_dxva2.h
  59. +0 −53 Externals/ffmpeg/include/libavutil/hwcontext_qsv.h
  60. +0 −82 Externals/ffmpeg/include/libavutil/hwcontext_vaapi.h
  61. +0 −44 Externals/ffmpeg/include/libavutil/hwcontext_vdpau.h
  62. +0 −227 Externals/ffmpeg/include/libavutil/imgutils.h
  63. +0 −77 Externals/ffmpeg/include/libavutil/intfloat.h
  64. +0 −629 Externals/ffmpeg/include/libavutil/intreadwrite.h
  65. +0 −62 Externals/ffmpeg/include/libavutil/lfg.h
  66. +0 −376 Externals/ffmpeg/include/libavutil/log.h
  67. +0 −50 Externals/ffmpeg/include/libavutil/macros.h
  68. +0 −89 Externals/ffmpeg/include/libavutil/mastering_display_metadata.h
  69. +0 −242 Externals/ffmpeg/include/libavutil/mathematics.h
  70. +0 −89 Externals/ffmpeg/include/libavutil/md5.h
  71. +0 −696 Externals/ffmpeg/include/libavutil/mem.h
  72. +0 −57 Externals/ffmpeg/include/libavutil/motion_vector.h
  73. +0 −114 Externals/ffmpeg/include/libavutil/murmur3.h
  74. +0 −865 Externals/ffmpeg/include/libavutil/opt.h
  75. +0 −193 Externals/ffmpeg/include/libavutil/parseutils.h
  76. +0 −394 Externals/ffmpeg/include/libavutil/pixdesc.h
  77. +0 −52 Externals/ffmpeg/include/libavutil/pixelutils.h
  78. +0 −490 Externals/ffmpeg/include/libavutil/pixfmt.h
  79. +0 −43 Externals/ffmpeg/include/libavutil/random_seed.h
  80. +0 −214 Externals/ffmpeg/include/libavutil/rational.h
  81. +0 −66 Externals/ffmpeg/include/libavutil/rc4.h
  82. +0 −50 Externals/ffmpeg/include/libavutil/replaygain.h
  83. +0 −83 Externals/ffmpeg/include/libavutil/ripemd.h
  84. +0 −272 Externals/ffmpeg/include/libavutil/samplefmt.h
  85. +0 −90 Externals/ffmpeg/include/libavutil/sha.h
  86. +0 −92 Externals/ffmpeg/include/libavutil/sha512.h
  87. +0 −170 Externals/ffmpeg/include/libavutil/stereo3d.h
  88. +0 −71 Externals/ffmpeg/include/libavutil/tea.h
  89. +0 −107 Externals/ffmpeg/include/libavutil/threadmessage.h
  90. +0 −56 Externals/ffmpeg/include/libavutil/time.h
  91. +0 −140 Externals/ffmpeg/include/libavutil/timecode.h
  92. +0 −78 Externals/ffmpeg/include/libavutil/timestamp.h
  93. +0 −138 Externals/ffmpeg/include/libavutil/tree.h
  94. +0 −70 Externals/ffmpeg/include/libavutil/twofish.h
  95. +0 −145 Externals/ffmpeg/include/libavutil/version.h
  96. +0 −94 Externals/ffmpeg/include/libavutil/xtea.h
  97. +0 −583 Externals/ffmpeg/include/libswresample/swresample.h
  98. +0 −45 Externals/ffmpeg/include/libswresample/version.h
  99. +0 −336 Externals/ffmpeg/include/libswscale/swscale.h
  100. +0 −53 Externals/ffmpeg/include/libswscale/version.h
  101. BIN Externals/ffmpeg/lib/avcodec.lib
  102. BIN Externals/ffmpeg/lib/avformat.lib
  103. BIN Externals/ffmpeg/lib/avutil.lib
  104. BIN Externals/ffmpeg/lib/swresample.lib
  105. BIN Externals/ffmpeg/lib/swscale.lib
  106. +1 −0 Source/Core/DolphinLib.props
  107. +0 −1 Source/Core/DolphinLib.x64.props
  108. +0 −3 Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj
  109. +0 −5 Source/Core/DolphinQt/DolphinQt.vcxproj
  110. +0 −8 Source/Core/DolphinTool/DolphinTool.vcxproj
  111. +0 −3 Source/Core/VideoCommon/FrameDump.cpp
  112. +0 −7 Source/UnitTests/UnitTests.vcxproj
  113. +12 −4 Source/VSProps/Base.props
5 .gitmodules
View file
@@ -8,3 +8,8 @@
url = https://github.com/mgba-emu/mgba.git
branch = master
shallow = true
[submodule "Externals/FFmpeg-bin"]
path = Externals/FFmpeg-bin
url = https://github.com/dolphin-emu/ext-win-ffmpeg.git
branch = master
shallow = true
8 CMakeLists.txt
View file
@@ -485,8 +485,12 @@ if(ENABLE_EGL)
endif()

if(ENCODE_FRAMEDUMPS)
if(WIN32 AND _M_X86_64)
set(FFMPEG_DIR Externals/ffmpeg)
if(WIN32)
if(_M_X86_64)
set(FFMPEG_DIR Externals/FFmpeg-bin/x64)
elseif(_M_ARM_64)
set(FFMPEG_DIR Externals/FFmpeg-bin/ARM64)
endif()
endif()
find_package(FFmpeg COMPONENTS avcodec avformat avutil swresample swscale)
if(FFmpeg_FOUND)
1 Externals/FFmpeg-bin
Submodule FFmpeg-bin added at 9bc087

0 comments on commit 09432ef

Please sign in to comment.