summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2024-03-31 10:26:22 -0300
committerDaniel Bermond2024-03-31 10:26:22 -0300
commit2a31369167d7973e18d659a82e134ffa0d354f3d (patch)
tree05c05a34e358d39ded644165e92433abefd603d7
parent1c089ce577fc06c7ab362ba804078eba45d40542 (diff)
downloadaur-2a31369167d7973e18d659a82e134ffa0d354f3d.tar.gz
Add fix for svt hevc/vp9. Remove old patch. Refresh other patches.
-rw-r--r--006-ffmpeg-add-svt-vp9-gaaa8140.patch38
-rw-r--r--011-ffmpeg-add-svt-hevc-g78bcaa7.patch10
-rw-r--r--031-ffmpeg-add-svt-vp9-g3ecdf8f.patch10
3 files changed, 20 insertions, 38 deletions
diff --git a/006-ffmpeg-add-svt-vp9-gaaa8140.patch b/006-ffmpeg-add-svt-vp9-gaaa8140.patch
deleted file mode 100644
index cdbcb54a0e7c..000000000000
--- a/006-ffmpeg-add-svt-vp9-gaaa8140.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/030-ffmpeg-add-svt-vp9-gaaa8140.patch
-+++ b/030-ffmpeg-add-svt-vp9-gaaa8140.patch
-@@ -44,7 +44,7 @@ index 932805ccf3..45306434fb 100755
- libwebp_encoder_deps="libwebp"
- libwebp_anim_encoder_deps="libwebp"
- libx262_encoder_deps="libx262"
--@@ -6715,6 +6718,7 @@ enabled libvpx && {
-+@@ -6721,6 +6724,7 @@ enabled libvpx && {
- fi
- }
-
-@@ -56,10 +56,10 @@ diff --git a/libavcodec/Makefile b/libav
- index 389253f5d0..1573ae4c34 100644
- --- a/libavcodec/Makefile
- +++ b/libavcodec/Makefile
--@@ -1123,6 +1123,7 @@ OBJS-$(CONFIG_LIBVPX_VP8_DECODER) += libvpxdec.o
-+@@ -1123,6 +1123,7 @@ OBJS-$(CONFIG_LIBVPX_VP8_DECODER)
- OBJS-$(CONFIG_LIBVPX_VP8_ENCODER) += libvpxenc.o
-- OBJS-$(CONFIG_LIBVPX_VP9_DECODER) += libvpxdec.o libvpx.o
-- OBJS-$(CONFIG_LIBVPX_VP9_ENCODER) += libvpxenc.o libvpx.o
-+ OBJS-$(CONFIG_LIBVPX_VP9_DECODER) += libvpxdec.o
-+ OBJS-$(CONFIG_LIBVPX_VP9_ENCODER) += libvpxenc.o
- +OBJS-$(CONFIG_LIBSVT_VP9_ENCODER) += libsvt_vp9.o
- OBJS-$(CONFIG_LIBWEBP_ENCODER) += libwebpenc_common.o libwebpenc.o
- OBJS-$(CONFIG_LIBWEBP_ANIM_ENCODER) += libwebpenc_common.o libwebpenc_animencoder.o
-@@ -68,10 +68,10 @@ diff --git a/libavcodec/allcodecs.c b/li
- index e593ad19af..a5396c0477 100644
- --- a/libavcodec/allcodecs.c
- +++ b/libavcodec/allcodecs.c
--@@ -799,6 +799,7 @@ extern const FFCodec ff_libvpx_vp8_encoder;
-+@@ -799,6 +799,7 @@ extern const FFCodec ff_libvpx_vp8_encod
- extern const FFCodec ff_libvpx_vp8_decoder;
- extern FFCodec ff_libvpx_vp9_encoder;
-- extern FFCodec ff_libvpx_vp9_decoder;
-+ extern const FFCodec ff_libvpx_vp9_decoder;
- +extern FFCodec ff_libsvt_vp9_encoder;
- /* preferred over libwebp */
- extern const FFCodec ff_libwebp_anim_encoder;
diff --git a/011-ffmpeg-add-svt-hevc-g78bcaa7.patch b/011-ffmpeg-add-svt-hevc-g78bcaa7.patch
new file mode 100644
index 000000000000..6391fc0bc67d
--- /dev/null
+++ b/011-ffmpeg-add-svt-hevc-g78bcaa7.patch
@@ -0,0 +1,10 @@
+--- a/libavcodec/libsvt_hevc.c
++++ b/libavcodec/libsvt_hevc.c
+@@ -24,6 +24,7 @@
+
+ #include "libavutil/common.h"
+ #include "libavutil/frame.h"
++#include "libavutil/mem.h"
+ #include "libavutil/opt.h"
+
+ #include "codec_internal.h"
diff --git a/031-ffmpeg-add-svt-vp9-g3ecdf8f.patch b/031-ffmpeg-add-svt-vp9-g3ecdf8f.patch
new file mode 100644
index 000000000000..ee3d673be741
--- /dev/null
+++ b/031-ffmpeg-add-svt-vp9-g3ecdf8f.patch
@@ -0,0 +1,10 @@
+--- a/libavcodec/libsvt_vp9.c
++++ b/libavcodec/libsvt_vp9.c
+@@ -26,6 +26,7 @@
+
+ #include "libavutil/common.h"
+ #include "libavutil/frame.h"
++#include "libavutil/mem.h"
+ #include "libavutil/opt.h"
+ #include "libavcodec/get_bits.h"
+