New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
windows: move ffmpeg bins to submodule #10530
Conversation
Yeah, I agree this is the better way to do this. |
it seems to make git mad when a directory is removed and a submodule is created in the same location in the same commit. |
Are you sure the problem isn't that you didn't append |
I don't think it's a problem? The submodule works in a local clone of the shuffle2/dolphin repo. But there is a problem like:
...git leaves Externals/FFmpeg with submodule contents instead of deleting it. I wonder if that is the problem? edit: this is probably from fsmonitor-deamon, but not sure. |
hrm, after looking at the FS on the windows buildbot, it seems .git/modules/Externals/ffmpeg is the content of the submodule introduced by #10249 (case insensitive FS, remember...). Maybe that is the problem on the buildbot. The problem in my previous comment would still apply, I think. |
So is this good to go? Looks fine to me. |
from my side it is |
@shuffle2 I would like to copy the contents of https://github.com/shuffle2/ext-win-ffmpeg to https://github.com/dolphin-emu/ext-win-ffmpeg before merging this, so that building Dolphin doesn't rely on the GitHub accounts of individuals still existing. Does this sound fine to you? I would create the repo and you would have to change the |
yes that's fine |
It has now been created at https://github.com/dolphin-emu/ext-win-ffmpeg. I'm not sure exactly how the permissions are set up. I'm assuming there isn't more you need to do inside that repository for now, but if you want to do something with the repository in the future and the permissions seem to restrictive, just let me know. |
udpate ffmpeg to b1cbeabf5e4b3234e895a58bafa371bfb792baf0 enable ffmpeg on arm64
it's switched over, and i checked that windows buildbot switched to the correct remote for the submodule as well (it did; didn't need any intervention) |
Tested, works. Let's merge this! |
windows: move ffmpeg bins to submodule
udpate ffmpeg to 28d011516b72a2401b2289a4be34c6e8ab611a0b
enable ffmpeg on arm64
plumb ffmpeg logging to dolphin logging
contains the change from #10249 to enable utvideo, since that was the motivation to fixup ffmpeg stuff.
I also experimented with adding h264/hevc encoders (the Media Foundation backends are nice), but realized users that want that sort of functionality will probably just use xbox game bar recording or something.