99 lines
5.2 KiB
Diff
99 lines
5.2 KiB
Diff
--- a/libhb/module.defs 2024-12-22 00:19:33.000000000 +0100
|
|
+++ b/libhb/module.defs 2024-12-22 00:20:50.031138428 +0100
|
|
@@ -1,4 +1,4 @@
|
|
-__deps__ := A52DEC BZIP2 LIBVPX FFMPEG FREETYPE LAME LIBASS LIBDCA \
|
|
+__deps__ := A52DEC BZIP2 FFMPEG FREETYPE LAME LIBASS LIBDCA \
|
|
LIBDVDREAD LIBDVDNAV LIBICONV LIBSAMPLERATE LIBTHEORA LIBVORBIS LIBOGG \
|
|
LIBXML2 X264 X265 ZLIB LIBBLURAY FDKAAC LIBMFX LIBGNURX JANSSON \
|
|
HARFBUZZ LIBOPUS LIBSPEEX
|
|
@@ -102,7 +102,7 @@
|
|
|
|
LIBHB.dll.libs = $(foreach n, \
|
|
ass avformat avfilter avcodec avutil swresample postproc dvdnav dvdread \
|
|
- freetype mp3lame swscale vpx theora vorbis vorbisenc ogg \
|
|
+ freetype mp3lame swscale theora vorbis vorbisenc ogg \
|
|
x264 xml2 bluray jansson harfbuzz opus speex, \
|
|
$(CONTRIB.build/)lib/lib$(n).a )
|
|
|
|
--- a/contrib/ffmpeg/module.defs 2025-02-04 00:32:38.000000000 +0100
|
|
+++ b/contrib/ffmpeg/module.defs 2025-02-04 00:35:13.385822713 +0100
|
|
@@ -1,4 +1,4 @@
|
|
-__deps__ := BZIP2 ZLIB FDKAAC LIBVPX LAME LIBOPUS LIBSPEEX XZ
|
|
+__deps__ := BZIP2 ZLIB FDKAAC LAME LIBOPUS LIBSPEEX XZ
|
|
ifeq (1,$(FEATURE.qsv))
|
|
__deps__ += LIBMFX
|
|
endif
|
|
@@ -50,10 +50,10 @@
|
|
--enable-libspeex \
|
|
--disable-encoder=libspeex \
|
|
--enable-decoder=libspeex \
|
|
- --enable-libvpx \
|
|
+ --disable-libvpx \
|
|
--disable-decoder=libvpx_* \
|
|
- --enable-encoder=libvpx_vp8 \
|
|
- --enable-encoder=libvpx_vp9 \
|
|
+ --disable-encoder=libvpx_vp8 \
|
|
+ --disable-encoder=libvpx_vp9 \
|
|
--disable-decoder=*_crystalhd \
|
|
--disable-libdav1d \
|
|
--disable-decoder=libdav1d \
|
|
--- a/make/include/main.defs 2024-12-22 00:19:33.000000000 +0100
|
|
+++ b/make/include/main.defs 2024-12-22 00:21:54.642892563 +0100
|
|
@@ -27,7 +27,6 @@
|
|
MODULES += contrib/lame
|
|
MODULES += contrib/x264
|
|
MODULES += contrib/jansson
|
|
- MODULES += contrib/libvpx
|
|
endif
|
|
|
|
ifeq (1,$(FEATURE.flatpak))
|
|
--- a/gtk/configure.ac 2024-12-22 00:19:33.000000000 +0100
|
|
+++ b/gtk/configure.ac 2024-12-22 00:22:30.353862075 +0100
|
|
@@ -199,7 +199,7 @@
|
|
|
|
AM_CONDITIONAL([MINGW], [test "x$mingw_flag" = "xyes"])
|
|
|
|
-HB_LIBS="$HB_LIBS -lhandbrake -lavformat -lavfilter -lavcodec -lavutil -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
|
|
+HB_LIBS="$HB_LIBS -lhandbrake -lavformat -lavfilter -lavcodec -lavutil -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lswscale -ltheoraenc -ltheoradec -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
|
|
HB_CPPFLAGS="$HB_CPPFLAGS $HBINC"
|
|
|
|
PKG_CHECK_MODULES([x264], [x264], sys_x264=yes, sys_x264=no)
|
|
--- a/test/module.defs 2024-12-22 00:19:33.000000000 +0100
|
|
+++ b/test/module.defs 2024-12-22 00:23:04.894799828 +0100
|
|
@@ -16,7 +16,7 @@
|
|
TEST.GCC.l = \
|
|
ass avformat avfilter avcodec avutil swresample postproc mp3lame dvdnav \
|
|
dvdread fribidi \
|
|
- swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 \
|
|
+ swscale theoraenc theoradec vorbis vorbisenc ogg x264 \
|
|
bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma
|
|
|
|
ifeq (,$(filter $(HOST.system),darwin cygwin mingw))
|
|
--- a/libhb/common.c 2020-01-04 17:28:06.000000000 +0100
|
|
+++ b/libhb/common.c 2025-01-22 22:44:45.069030048 +0100
|
|
@@ -80,7 +80,6 @@
|
|
HB_GID_ACODEC_OPUS,
|
|
HB_GID_MUX_MKV,
|
|
HB_GID_MUX_MP4,
|
|
- HB_GID_MUX_WEBM,
|
|
};
|
|
|
|
#define HB_VIDEO_CLOCK 27000000 // 27MHz clock
|
|
@@ -266,8 +265,6 @@
|
|
{ { "H.265 (VideoToolbox)","vt_h265", "H.265 (libavcodec)", HB_VCODEC_FFMPEG_VT_H265, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_H265, },
|
|
{ { "MPEG-4", "mpeg4", "MPEG-4 (libavcodec)", HB_VCODEC_FFMPEG_MPEG4, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_MPEG4, },
|
|
{ { "MPEG-2", "mpeg2", "MPEG-2 (libavcodec)", HB_VCODEC_FFMPEG_MPEG2, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_MPEG2, },
|
|
- { { "VP8", "VP8", "VP8 (libvpx)", HB_VCODEC_FFMPEG_VP8, HB_MUX_MASK_WEBM|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_VP8, },
|
|
- { { "VP9", "VP9", "VP9 (libvpx)", HB_VCODEC_FFMPEG_VP9, HB_MUX_MASK_WEBM|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_VP9, },
|
|
{ { "Theora", "theora", "Theora (libtheora)", HB_VCODEC_THEORA, HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_THEORA, },
|
|
};
|
|
int hb_video_encoders_count = sizeof(hb_video_encoders) / sizeof(hb_video_encoders[0]);
|
|
@@ -452,7 +449,6 @@
|
|
{ { "MPEG-4 (mp4v2)", "mp4v2", "MPEG-4 (libmp4v2)", "mp4", HB_MUX_MP4V2, }, NULL, 1, HB_GID_MUX_MP4, },
|
|
{ { "Matroska (avformat)", "av_mkv", "Matroska (libavformat)", "mkv", HB_MUX_AV_MKV, }, NULL, 1, HB_GID_MUX_MKV, },
|
|
{ { "Matroska (libmkv)", "libmkv", "Matroska (libmkv)", "mkv", HB_MUX_LIBMKV, }, NULL, 1, HB_GID_MUX_MKV, },
|
|
- { { "WebM (avformat)", "av_webm", "WebM (libavformat)", "webm", HB_MUX_AV_WEBM, }, NULL, 1, HB_GID_MUX_WEBM, },
|
|
};
|
|
int hb_containers_count = sizeof(hb_containers) / sizeof(hb_containers[0]);
|
|
static int hb_container_is_enabled(int format)
|