mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-02-12 00:40:14 +00:00
0a54e34a9b
The prior FFMPEG merge was not properly rebased to Vita3K master. I created a backup branch arm64_old on the current commit. I reset master to vita3k master and cherry picked our 5 commits. Then I squashed the last 2 commits because one of them was obsolete.