ffmpeg: rebase patch with mem.h

Signed-off-by: Christopher Degawa <ccom@randomderp.com>
OpenVisualCloud · Apr 3, 2024 · 3b9a3fa · 3b9a3fa
1 parent 3ecdf8f
commit 3b9a3fa
Showing 1 changed file with 16 additions and 15 deletions.
diff --git a/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch b/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch
@@ -1,4 +1,4 @@
-From b642e01571d63812758a7cb2653e7bfbe3bbac30 Mon Sep 17 00:00:00 2001
+From bcecbfb0188680c2f4e355ad843639f6198b36da Mon Sep 17 00:00:00 2001
 From: hassene <hassene.tmar@intel.com>
 Date: Fri, 15 Feb 2019 17:43:54 -0800
 Subject: [PATCH] Add ability for ffmpeg to run svt vp9
@@ -12,39 +12,39 @@ Signed-off-by: Guo Jiansheng <jiansheng.guo@intel.com>
  configure               |   4 +
  libavcodec/Makefile     |   1 +
  libavcodec/allcodecs.c  |   1 +
- libavcodec/libsvt_vp9.c | 700 ++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 706 insertions(+)
+ libavcodec/libsvt_vp9.c | 701 ++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 707 insertions(+)
  create mode 100644 libavcodec/libsvt_vp9.c
 
 diff --git a/configure b/configure
-index 68f675a4bc..b9c8725cf5 100755
+index 71386c3920..3d3e7ba5a5 100755
 --- a/configure
 +++ b/configure
-@@ -288,6 +288,7 @@ External library support:
+@@ -292,6 +292,7 @@ External library support:
    --enable-libvorbis       enable Vorbis en/decoding via libvorbis,
                             native implementation exists [no]
    --enable-libvpx          enable VP8 and VP9 de/encoding via libvpx [no]
 +  --enable-libsvtvp9       enable VP9 encoding via svt [no]
    --enable-libwebp         enable WebP encoding via libwebp [no]
    --enable-libx264         enable H.264 encoding via x264 [no]
    --enable-libx265         enable HEVC encoding via x265 [no]
-@@ -1892,6 +1893,7 @@ EXTERNAL_LIBRARY_LIST="
+@@ -1948,6 +1949,7 @@ EXTERNAL_LIBRARY_LIST="
      libshaderc
      libshine
      libsmbclient
 +    libsvtvp9
      libsnappy
      libsoxr
      libspeex
-@@ -3477,6 +3479,7 @@ libvpx_vp8_decoder_deps="libvpx"
+@@ -3537,6 +3539,7 @@ libvpx_vp8_decoder_deps="libvpx"
  libvpx_vp8_encoder_deps="libvpx"
  libvpx_vp9_decoder_deps="libvpx"
  libvpx_vp9_encoder_deps="libvpx"
 +libsvt_vp9_encoder_deps="libsvtvp9"
  libwebp_encoder_deps="libwebp"
  libwebp_anim_encoder_deps="libwebp"
  libx262_encoder_deps="libx262"
-@@ -6907,6 +6910,7 @@ enabled libvpx            && {
+@@ -6995,6 +6998,7 @@ enabled libvpx            && {
      fi
  }
 
@@ -53,10 +53,10 @@ index 68f675a4bc..b9c8725cf5 100755
      enabled libwebp_encoder      && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion
      enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; }
 diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index 470d7cb9b1..3498da3d2d 100644
+index 8c8c2ce659..2a00269821 100644
 --- a/libavcodec/Makefile
 +++ b/libavcodec/Makefile
-@@ -1153,6 +1153,7 @@ OBJS-$(CONFIG_LIBVPX_VP8_DECODER)         += libvpxdec.o
+@@ -1149,6 +1149,7 @@ OBJS-$(CONFIG_LIBVPX_VP8_DECODER)         += libvpxdec.o
  OBJS-$(CONFIG_LIBVPX_VP8_ENCODER)         += libvpxenc.o
  OBJS-$(CONFIG_LIBVPX_VP9_DECODER)         += libvpxdec.o
  OBJS-$(CONFIG_LIBVPX_VP9_ENCODER)         += libvpxenc.o
@@ -65,10 +65,10 @@ index 470d7cb9b1..3498da3d2d 100644
  OBJS-$(CONFIG_LIBWEBP_ANIM_ENCODER)       += libwebpenc_common.o libwebpenc_animencoder.o
  OBJS-$(CONFIG_LIBX262_ENCODER)            += libx264.o
 diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
-index ef8c3a6d7d..01bfa800a6 100644
+index 2386b450a6..58b17d4c34 100644
 --- a/libavcodec/allcodecs.c
 +++ b/libavcodec/allcodecs.c
-@@ -809,6 +809,7 @@ extern const FFCodec ff_libvpx_vp8_encoder;
+@@ -799,6 +799,7 @@ extern const FFCodec ff_libvpx_vp8_encoder;
  extern const FFCodec ff_libvpx_vp8_decoder;
  extern FFCodec ff_libvpx_vp9_encoder;
  extern const FFCodec ff_libvpx_vp9_decoder;
@@ -78,10 +78,10 @@ index ef8c3a6d7d..01bfa800a6 100644
  extern const FFCodec ff_libwebp_encoder;
 diff --git a/libavcodec/libsvt_vp9.c b/libavcodec/libsvt_vp9.c
 new file mode 100644
-index 0000000000..4d2701d679
+index 0000000000..05d2a95e99
 --- /dev/null
 +++ b/libavcodec/libsvt_vp9.c
-@@ -0,0 +1,700 @@
+@@ -0,0 +1,701 @@
 +/*
 +* Scalable Video Technology for VP9 encoder library plugin
 +*
@@ -110,6 +110,7 @@ index 0000000000..4d2701d679
 +
 +#include "libavutil/common.h"
 +#include "libavutil/frame.h"
++#include "libavutil/mem.h"
 +#include "libavutil/opt.h"
 +#include "libavcodec/get_bits.h"
 +
@@ -783,5 +784,5 @@ index 0000000000..4d2701d679
 +    .p.wrapper_name   = "libsvt_vp9",
 +};
 -- 
-2.43.0
+2.44.0