Merge pull request #49 from Kelebek1/update_ffmpeg

Update ffmpeg, adding codec_internal.h
2023-12-25 06:40:38 +00:00 · 2023-12-24 16:11:46 +00:00 · 2023-10-06 17:01:15 -04:00 · 2023-10-06 13:44:04 -04:00 · 2023-08-28 14:37:21 -04:00 · 2023-08-27 20:51:13 -06:00
5 changed files with 2 additions and 2 deletions
--- a/breakpad/breakpad-c89f9dd.7z
+++ b/breakpad/breakpad-c89f9dd.7z
--- a/ffmpeg/ffmpeg-6.0.7z
+++ b/ffmpeg/ffmpeg-6.0.7z
--- a/ffmpeg/ffmpeg_compile.sh
+++ b/ffmpeg/ffmpeg_compile.sh
@ -6,7 +6,7 @@
 set -e
 THIS=$(readlink -e $0)
-VERSION=5.1.3
+VERSION=6.0
 INSTALL_DIR=ffmpeg-${VERSION}
 REQUIRED_DLLS_NAME=requirements.txt
@ -52,7 +52,7 @@ cd build
    --enable-avfilter \
    --enable-shared \
    --disable-iconv \
-    --enable-filter=yadif \
+    --enable-filter=yadif,scale \
    --enable-d3d11va \
    --enable-hwaccel={h264_nvdec,vp9_nvdec} \
    --enable-nvdec \
--- a/nasm/nasm-2.16.01-win64.zip
+++ b/nasm/nasm-2.16.01-win64.zip
--- a/sdl2/SDL2-2.28.2.7z
+++ b/sdl2/SDL2-2.28.2.7z
Author	SHA1	Message	Date
Maide	ef810aabad	Merge pull request #49 from Kelebek1/update_ffmpeg Update ffmpeg, adding codec_internal.h	2023-12-25 06:40:38 +00:00
Kelebek1	f94ceab6dc	Update ffmpeg, adding codec_internal.h	2023-12-24 16:11:46 +00:00
liamwhite	bfb3b2eb34	Merge pull request #48 from yuzu-emu/breakpad Add breakpad from yuzu-emu/breakpad@c89f9dd	2023-10-06 17:01:15 -04:00
Liam	5e985a2f08	Add breakpad from yuzu-emu/breakpad@c89f9dd	2023-10-06 13:44:04 -04:00
liamwhite	bf318cc570	Merge pull request #47 from yuzu-emu/sdl2-28-2 Update to SDL 2.28.2 without wgi	2023-08-28 14:37:21 -04:00
Narr the Reg	72e17e5123	Update to SDL 2.28.2 without wgi	2023-08-27 20:51:13 -06:00
liamwhite	59ffb4e33a	Merge pull request #46 from lat9nq/ff-scale ffmpeg: Add scale filter and FFmpeg 6.0 libs	2023-08-27 16:16:57 -04:00
lat9nq	674ce20996	ffmpeg: Add scale filter and FFmpeg 6.0 libs	2023-08-27 14:35:41 -04:00
Morph	c1bd1e3aeb	Merge pull request #44 from Morph1984/unreliable-webhost nasm: Host nasm (Netwide Assembler) ourselves	2023-07-25 02:44:16 -04:00
Morph	5688bae792	nasm: Host nasm (Netwide Assembler) ourselves nasm.us has intermittent availability, and has been down for longer than several hours at a time. Thus, we should host this file ourselves. This file should be copied over to externals/vcpkg/downloads, and it will be automatically extracted by vcpkg.	2023-07-25 02:43:37 -04:00