Merge branch 'main' into fix/vp9-hwaccel

Author: birros

patches/ffmpeg-fix-hls-mp4-seek.patch

@@ -0,0 +1,14 @@
+diff --git a/libavformat/hls.c b/libavformat/hls.c
+index 2a2fe28a540f..c625e3029116 100644
+--- a/libavformat/hls.c
++++ b/libavformat/hls.c
+@@ -2506,6 +2506,9 @@ static int hls_read_seek(AVFormatContext *s, int stream_index,
+         /* Flush the packet queue of the subdemuxer. */
+         ff_read_frame_flush(pls->ctx);
+ 
++        /* Reset the init segment so it's re-fetched and served appropiately */
++        pls->cur_init_section = NULL;
++
+         pls->seek_timestamp = seek_timestamp;
+         pls->seek_flags = flags;
+ 

scripts/ffmpeg/build.sh

@@ -6,6 +6,7 @@ set -u # treat unset variables as an error
 cd ${SRC_DIR}
 
 patch -p1 <${PROJECT_DIR}/patches/ffmpeg-fix-vp9-hwaccel.patch
+patch -p1 <${PROJECT_DIR}/patches/ffmpeg-fix-hls-mp4-seek.patch
 patch -p1 <${PROJECT_DIR}/patches/ffmpeg-fix-ios-hdr-texture.patch
 patch -p1 <${PROJECT_DIR}/patches/ffmpeg-fix-dash-base-url-escape.patch
 

scripts/freetype/build.sh

@@ -11,8 +11,8 @@ meson setup build \
     -Dbzip2=disabled \
     -Dharfbuzz=enabled \
     -Dmmap=disabled \
-    -Dpng=disabled \
+    -Dpng=enabled \
     -Dtests=disabled \
-    -Dzlib=disabled
+    -Dzlib=enabled
 meson compile -C build
 meson install -C build

scripts/mpv/build.sh

@@ -137,6 +137,7 @@ COMMON_OPTIONS=(
 COMMON_VIDEO_OPTIONS=(
     `# misc features`
     -Duchardet=enabled `# uchardet support`
+    -Dzlib=enabled `# zlib`
 
     `# video output features`
     -Dgl=enabled `# OpenGL context support`