contrib: ffmpeg: remove libav

contrib/src/ffmpeg/libav_gsm.patch

@@ -1,72 +0,0 @@
-From d66948bc3960b993da55a7899ced91c38fadeed1 Mon Sep 17 00:00:00 2001
-From: Konstantin Pavlov <thresh@videolan.org>
-Date: Thu, 7 Dec 2017 11:29:55 +0300
-Subject: [PATCH] Revert "build: Remove check for gsm/gsm.h for libgsm"
-
-This reverts commit 8e97a8c69162afce47abea96c8c0914f3550e212.
----
- configure              | 5 ++++-
- libavcodec/libgsmdec.c | 5 +++++
- libavcodec/libgsmenc.c | 5 +++++
- 3 files changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 7f320fee1..c2bb05c26 100755
---- a/configure
-+++ b/configure
-@@ -1545,6 +1545,7 @@ HEADERS_LIST="
-     direct_h
-     dxgidebug_h
-     dxva_h
-+    gsm_h
-     io_h
-     machine_ioctl_bt848_h
-     machine_ioctl_meteor_h
-@@ -4595,7 +4596,9 @@ enabled libfaac           && require libfaac "stdint.h faac.h" faacEncGetVersion
- enabled libfdk_aac        && require_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen
- enabled libfontconfig     && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit
- enabled libfreetype       && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
--enabled libgsm            && require libgsm gsm.h gsm_create -lgsm
-+enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
-+                                   check_lib libgsm "${gsm_hdr}" gsm_create -lgsm && break;
-+                               done || die "ERROR: libgsm not found"; }
- enabled libhdcd           && require_pkg_config libhdcd libhdcd "hdcd/hdcd_simple.h" hdcd_new
- enabled libilbc           && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc
- enabled libkvazaar        && require_pkg_config libkvazaar "kvazaar >= 0.8.1" kvazaar.h kvz_api_get
-diff --git a/libavcodec/libgsmdec.c b/libavcodec/libgsmdec.c
-index e06fe5276..4c21ff672 100644
---- a/libavcodec/libgsmdec.c
-+++ b/libavcodec/libgsmdec.c
-@@ -27,7 +27,12 @@
-
- // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
-
-+#include "config.h"
-+#if HAVE_GSM_H
- #include <gsm.h>
-+#else
-+#include <gsm/gsm.h>
-+#endif
-
- #include "libavutil/channel_layout.h"
- #include "libavutil/common.h"
-diff --git a/libavcodec/libgsmenc.c b/libavcodec/libgsmenc.c
-index 4bb4075b2..8f51321d4 100644
---- a/libavcodec/libgsmenc.c
-+++ b/libavcodec/libgsmenc.c
-@@ -27,7 +27,12 @@
-
- // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
-
-+#include "config.h"
-+#if HAVE_GSM_H
- #include <gsm.h>
-+#else
-+#include <gsm/gsm.h>
-+#endif
-
- #include "libavutil/common.h"
-
---
-2.11.0 (Apple Git-81)
-

contrib/src/ffmpeg/rules.mak

@@ -1,21 +1,9 @@
 # FFmpeg
 
-#Uncomment the one you want
-#USE_LIBAV ?= 1
-#USE_FFMPEG ?= 1
-
-ifndef USE_LIBAV
 FFMPEG_HASH=dc91b913b6260e85e1304c74ff7bb3c22a8c9fb1
 FFMPEG_BRANCH=release/4.4
 FFMPEG_GITURL := http://git.videolan.org/git/ffmpeg.git
 FFMPEG_LAVC_MIN := 57.37.100
-USE_FFMPEG := 1
-else
-FFMPEG_HASH=e5afa1b556542fd7a52a0a9b409c80f2e6e1e9bb
-FFMPEG_BRANCH=
-FFMPEG_GITURL := git://git.libav.org/libav.git
-FFMPEG_LAVC_MIN := 57.16.0
-endif
 
 FFMPEG_BASENAME := $(subst .,_,$(subst \,_,$(subst /,_,$(FFMPEG_HASH))))
 
@@ -37,10 +25,7 @@ FFMPEGCONF = \
 	--disable-bzlib \
 	--disable-libvpx \
 	--disable-avresample \
-	--enable-bsf=vp9_superframe
-
-ifdef USE_FFMPEG
-FFMPEGCONF += \
+	--enable-bsf=vp9_superframe \
 	--disable-swresample \
 	--disable-iconv \
 	--disable-avisynth \
@@ -50,23 +35,12 @@ ifdef HAVE_DARWIN_OS
 FFMPEGCONF += \
 	--disable-securetransport
 endif
-endif
-
-# Disable VDA on macOS with libav
-ifdef USE_LIBAV
-ifdef HAVE_DARWIN_OS
-FFMPEGCONF += \
-	--disable-vda
-endif
-endif
 
 DEPS_ffmpeg = zlib gsm
 
-ifndef USE_LIBAV
 FFMPEGCONF += \
 	--enable-libopenjpeg
 DEPS_ffmpeg += openjpeg $(DEPS_openjpeg)
-endif
 
 # Optional dependencies
 ifndef BUILD_NETWORK
@@ -144,9 +118,7 @@ endif
 # Darwin
 ifdef HAVE_DARWIN_OS
 FFMPEGCONF += --arch=$(ARCH) --target-os=darwin --extra-cflags="$(CFLAGS)"
-ifdef USE_FFMPEG
 FFMPEGCONF += --disable-lzma
-endif
 ifeq ($(ARCH),x86_64)
 FFMPEGCONF += --cpu=core2
 endif
@@ -232,7 +204,6 @@ $(TARBALLS)/ffmpeg-$(FFMPEG_BASENAME).tar.xz:
 
 ffmpeg: ffmpeg-$(FFMPEG_BASENAME).tar.xz .sum-ffmpeg
 	$(UNPACK)
-ifdef USE_FFMPEG
 	$(APPLY) $(SRC)/ffmpeg/armv7_fixup.patch
 	$(APPLY) $(SRC)/ffmpeg/dxva_vc1_crash.patch
 	$(APPLY) $(SRC)/ffmpeg/h264_early_SAR.patch
@@ -243,10 +214,6 @@ ifdef USE_FFMPEG
 	$(APPLY) $(SRC)/ffmpeg/0002-avcodec-mpeg12dec-don-t-end-a-slice-without-first_sl.patch
 	$(APPLY) $(SRC)/ffmpeg/0001-fix-mf_utils-compilation-with-mingw64.patch
 	$(APPLY) $(SRC)/ffmpeg/0001-avcodec-vp9-Do-not-destroy-uninitialized-mutexes-con.patch
-endif
-ifdef USE_LIBAV
-	$(APPLY) $(SRC)/ffmpeg/libav_gsm.patch
-endif
 	$(APPLY) $(SRC)/ffmpeg/0001-ffmpeg-add-target_os-support-for-emscripten.patch
 	$(MOVE)