Skip to content

Commit 737e06c

Browse files
committed
Updated mpv to 0.34.1 and ffmpeg to 5.0
1 parent 4d39fd9 commit 737e06c

File tree

2 files changed

+20
-9
lines changed

2 files changed

+20
-9
lines changed

download.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/sh -e
22

33
# Change to preferred versions
4-
MPV_VERSION="0.34.0"
5-
FFMPEG_VERSION="4.4"
4+
MPV_VERSION="0.34.1"
5+
FFMPEG_VERSION="5.0"
66
LIBASS_VERSION="0.14.0"
77
FREETYPE_VERSION="2.10.0"
88
HARFBUZZ_VERSION="2.6.4"
@@ -30,7 +30,7 @@ done
3030

3131
sed -i "" "s/typedef ptrdiff_t GLsizeiptr;/typedef intptr_t GLsizeiptr;/" ./src/mpv-$MPV_VERSION/video/out/opengl/gl_headers.h;
3232

33-
patch -p0 < mpv-patch.diff
33+
patch -p0 < patch.diff
3434

3535
echo "\033[1;32mDownloaded: \033[0m\n mpv: $MPV_VERSION \
3636
\n FFmpeg: $FFMPEG_VERSION \

mpv-patch.diff patch.diff

+17-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- src/mpv-0.34.0/bootstrap.py
2-
+++ src/mpv-0.34.0/bootstrap.py
1+
--- src/mpv-0.34.1/bootstrap.py
2+
+++ src/mpv-0.34.1/bootstrap.py
33
@@ -5,10 +5,10 @@
44
import os, sys, stat, hashlib, subprocess
55
from urllib.request import urlopen, URLError
@@ -13,8 +13,8 @@
1313

1414
if os.path.exists("waf"):
1515
wafver = subprocess.check_output([sys.executable, './waf', '--version']).decode()
16-
--- src/mpv-0.34.0/wscript
17-
+++ src/mpv-0.34.0/wscript
16+
--- src/mpv-0.34.1/wscript
17+
+++ src/mpv-0.34.1/wscript
1818
@@ -245,6 +245,12 @@ iconv support use --disable-iconv.",
1919
'desc': 'w32/dos paths',
2020
'deps': 'os-win32 || os-cygwin',
@@ -28,8 +28,8 @@
2828
}, {
2929
'name': 'glob-posix',
3030
'desc': 'glob() POSIX support',
31-
--- src/mpv-0.34.0/wscript_build.py
32-
+++ src/mpv-0.34.0/wscript_build.py
31+
--- src/mpv-0.34.1/wscript_build.py
32+
+++ src/mpv-0.34.1/wscript_build.py
3333
@@ -209,7 +209,7 @@ def build(ctx):
3434
])
3535

@@ -39,3 +39,14 @@
3939
( "osdep/subprocess-win.c", "win32-desktop" ),
4040
( "osdep/subprocess-dummy.c" ),
4141
])
42+
--- src/ffmpeg-5.0/libavfilter/metal/utils.m
43+
+++ src/ffmpeg-5.0/libavfilter/metal/utils.m
44+
@@ -31,7 +31,7 @@ void ff_metal_compute_encoder_dispatch(id<MTLDevice> device,
45+
BOOL fallback = YES;
46+
// MAC_OS_X_VERSION_10_15 is only defined on SDKs new enough to include its functionality (including iOS, tvOS, etc)
47+
#ifdef MAC_OS_X_VERSION_10_15
48+
- if (@available(macOS 10.15, iOS 11, tvOS 14.5, *)) {
49+
+ if (@available(macOS 10.15, iOS 13, tvOS 14.5, *)) {
50+
if ([device supportsFamily:MTLGPUFamilyCommon3]) {
51+
MTLSize threadsPerGrid = MTLSizeMake(width, height, 1);
52+
[encoder dispatchThreads:threadsPerGrid threadsPerThreadgroup:threadsPerThreadgroup];

0 commit comments

Comments
 (0)