RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-21 18:22:33 +01:00
Code Issues Releases Wiki Activity

Update FFMPEG to properly rebased branch

Browse Source 
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.
This commit is contained in:
Megamouse 2024-09-08 19:37:35 +02:00
parent 53c84577c0
commit 0a54e34a9b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/ffmpeg vendored

@ -1 +1 @@
Subproject commit ad755301a1c74d95819dc4bd5ce036a40e051e17 Subproject commit ec6367d3ba9d0d57b9d22d4b87da8144acaf428f