ffmpeg_patch: rebase master patch

Signed-off-by: Christopher Degawa <[email protected]>

ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch

@@ -1,4 +1,4 @@
-From 20d8a694d7ea7bba69e3db5f773903ae2ecd4d0f Mon Sep 17 00:00:00 2001
+From 673e67dfff221da589e28216927fe5efd5b40586 Mon Sep 17 00:00:00 2001
 From: Jing Sun <[email protected]>
 Date: Wed, 21 Nov 2018 11:33:04 +0800
 Subject: [PATCH] lavc/svt_hevc: add libsvt hevc encoder wrapper
@@ -19,7 +19,7 @@ Signed-off-by: Guo Jiansheng <[email protected]>
  create mode 100644 libavcodec/libsvt_hevc.c
 
 diff --git a/configure b/configure
-index 0f3042b8a7..655eaf6848 100755
+index c726076da1..c00fcd0294 100755
 --- a/configure
 +++ b/configure
 @@ -291,6 +291,7 @@ External library support:
@@ -30,23 +30,23 @@ index 0f3042b8a7..655eaf6848 100755
    --enable-libxavs         enable AVS encoding via xavs [no]
    --enable-libxavs2        enable AVS2 encoding via xavs2 [no]
    --enable-libxcb          enable X11 grabbing using XCB [autodetect]
-@@ -1866,6 +1867,7 @@ EXTERNAL_LIBRARY_LIST="
+@@ -1852,6 +1853,7 @@ EXTERNAL_LIBRARY_LIST="
      libsrt
      libssh
      libsvtav1
 +    libsvthevc
      libtensorflow
      libtesseract
      libtheora
-@@ -3399,6 +3401,7 @@ libx264_encoder_select="atsc_a53"
- libx264rgb_encoder_deps="libx264"
- libx264rgb_encoder_select="libx264_encoder"
- libx265_encoder_deps="libx265"
+@@ -3404,6 +3406,7 @@ vapoursynth_demuxer_deps="vapoursynth"
+ videotoolbox_suggest="coreservices"
+ videotoolbox_deps="corefoundation coremedia corevideo"
+ videotoolbox_encoder_deps="videotoolbox VTCompressionSessionPrepareToEncodeFrames"
 +libsvt_hevc_encoder_deps="libsvthevc"
- libxavs_encoder_deps="libxavs"
- libxavs2_encoder_deps="libxavs2"
- libxvid_encoder_deps="libxvid"
-@@ -6680,6 +6683,7 @@ enabled libssh            && require_pkg_config libssh libssh libssh/sftp.h sftp
+
+ # demuxers / muxers
+ ac3_demuxer_select="ac3_parser"
+@@ -6678,6 +6681,7 @@ enabled libssh            && require_pkg_config libssh libssh libssh/sftp.h sftp
  enabled libspeex          && require_pkg_config libspeex speex speex/speex.h speex_decoder_init
  enabled libsrt            && require_pkg_config libsrt "srt >= 1.3.0" srt/srt.h srt_socket
  enabled libsvtav1         && require_pkg_config libsvtav1 "SvtAv1Enc >= 0.9.0" EbSvtAv1Enc.h svt_av1_enc_init_handle
@@ -55,10 +55,10 @@ index 0f3042b8a7..655eaf6848 100755
  enabled libtesseract      && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate
  enabled libtheora         && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
 diff --git a/libavcodec/Makefile b/libavcodec/Makefile
-index 94dc75a1b2..4df3686f57 100644
+index 1fb963f820..77c9926ea6 100644
 --- a/libavcodec/Makefile
 +++ b/libavcodec/Makefile
-@@ -1109,6 +1109,7 @@ OBJS-$(CONFIG_LIBWEBP_ANIM_ENCODER)       += libwebpenc_common.o libwebpenc_anim
+@@ -1126,6 +1126,7 @@ OBJS-$(CONFIG_LIBWEBP_ANIM_ENCODER)       += libwebpenc_common.o libwebpenc_anim
  OBJS-$(CONFIG_LIBX262_ENCODER)            += libx264.o
  OBJS-$(CONFIG_LIBX264_ENCODER)            += libx264.o
  OBJS-$(CONFIG_LIBX265_ENCODER)            += libx265.o
@@ -67,10 +67,10 @@ index 94dc75a1b2..4df3686f57 100644
  OBJS-$(CONFIG_LIBXAVS2_ENCODER)           += libxavs2.o
  OBJS-$(CONFIG_LIBXVID_ENCODER)            += libxvid.o
 diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
-index f5ec3bc6e1..b82bae5ed9 100644
+index ff82423a88..57f085415c 100644
 --- a/libavcodec/allcodecs.c
 +++ b/libavcodec/allcodecs.c
-@@ -808,6 +808,7 @@ extern LIBX264_CONST FFCodec ff_libx264_encoder;
+@@ -812,6 +812,7 @@ extern LIBX264_CONST FFCodec ff_libx264_encoder;
  #endif
  extern const FFCodec ff_libx264rgb_encoder;
  extern FFCodec ff_libx265_encoder;
@@ -670,5 +670,5 @@ index 0000000000..739144ca0c
 +    .p.wrapper_name = "libsvt_hevc",
 +};
 -- 
-2.38.1
+2.39.1