main/ffmpeg: upgrade to 3.0

ref #5334

1 files changed, 55 insertions, 0 deletions

diff --git a/main/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch b/main/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
new file mode 100644
index 00000000000..93e3ac99575
--- /dev/null
+++ b/main/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
@@ -0,0 +1,55 @@
+From ab11be0becb90542f10d5713659b559842c53af2 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 29 Mar 2016 15:15:17 +0200
+Subject: [PATCH] libavutil: clean up unused FF_SYMVER macro
+
+There is nothing using it since commit d63443b9 (lavc: drop the
+av_fast_{re,m}alloc compatibility wrappers).
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ libavutil/internal.h | 28 ----------------------------
+ 1 file changed, 28 deletions(-)
+
+diff --git a/libavutil/internal.h b/libavutil/internal.h
+index 61784b5..69d63d5 100644
+--- a/libavutil/internal.h
++++ b/libavutil/internal.h
+@@ -177,34 +177,6 @@
+ #endif
+ 
+ /**
+- * Define a function with only the non-default version specified.
+- *
+- * On systems with ELF shared libraries, all symbols exported from
+- * FFmpeg libraries are tagged with the name and major version of the
+- * library to which they belong.  If a function is moved from one
+- * library to another, a wrapper must be retained in the original
+- * location to preserve binary compatibility.
+- *
+- * Functions defined with this macro will never be used to resolve
+- * symbols by the build-time linker.
+- *
+- * @param type return type of function
+- * @param name name of function
+- * @param args argument list of function
+- * @param ver  version tag to assign function
+- */
+-#if HAVE_SYMVER_ASM_LABEL
+-#   define FF_SYMVER(type, name, args, ver)                     \
+-    type ff_##name args __asm__ (EXTERN_PREFIX #name "@" ver);  \
+-    type ff_##name args
+-#elif HAVE_SYMVER_GNU_ASM
+-#   define FF_SYMVER(type, name, args, ver)                             \
+-    __asm__ (".symver ff_" #name "," EXTERN_PREFIX #name "@" ver);      \
+-    type ff_##name args;                                                \
+-    type ff_##name args
+-#endif
+-
+-/**
+  * Return NULL if a threading library has not been enabled.
+  * Used to disable threading functions in AVCodec definitions
+  * when not needed.
+-- 
+2.7.4
+