summaryrefslogtreecommitdiff
path: root/externals/ffmpeg
diff options
context:
space:
mode:
authorFranco M <francomaro@gmail.com>2023-11-04 21:28:16 -0300
committerGitHub <noreply@github.com>2023-11-04 21:28:16 -0300
commit728aca770317b3f86961c8669ba9ae5c68570d3f (patch)
tree29adffcb1d264cc16cacb478a8f6645ef6259b3b /externals/ffmpeg
parent7f62a48ab507d3874378c10944662d5b841c6c2e (diff)
parent940618a64dc048790291e240dca6a085a4f1c27c (diff)
Merge branch 'master' into new-shortcut
Diffstat (limited to 'externals/ffmpeg')
m---------externals/ffmpeg/ffmpeg0
1 files changed, 0 insertions, 0 deletions
diff --git a/externals/ffmpeg/ffmpeg b/externals/ffmpeg/ffmpeg
-Subproject 6b6b9e593dd4d3aaf75f48d40a13ef03bdef9fd
+Subproject 9c1294eaddb88cb0e044c675ccae059a85fc9c6