From b2f89250be2ae4ff4dc509209d996f515d737881 Mon Sep 17 00:00:00 2001
From: trav90 <travawine@protonmail.ch>
Date: Thu, 26 Apr 2018 16:56:17 -0500
Subject: [ffvpx] Update resync documentation

---
 media/ffvpx/FILES                 |  8 +-------
 media/ffvpx/README_MCP            | 10 ++++++++--
 media/ffvpx/libavutil/avconfig.h  |  1 -
 media/ffvpx/libavutil/ffversion.h |  2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'media')

diff --git a/media/ffvpx/FILES b/media/ffvpx/FILES
index 7ec1b7e44..ff8a2da43 100644
--- a/media/ffvpx/FILES
+++ b/media/ffvpx/FILES
@@ -2,6 +2,7 @@
 ./COPYING.LGPLv3
 ./compat/va_copy.h
 ./compat/w32pthreads.h
+./compat/atomics/win32/stdatomic.h
 ./libavcodec/audioconvert.c
 ./libavcodec/audioconvert.h
 ./libavcodec/avpicture.c
@@ -58,7 +59,6 @@
 ./libavcodec/x86/vp9itxfm_16bpp.asm
 ./libavcodec/x86/vp9itxfm_template.asm
 ./libavcodec/x86/vp9mc_16bpp.asm
-./libavcodec/x86/h264_i386.h
 ./libavcodec/x86/vp9lpf.asm
 ./libavcodec/x86/vp9lpf_16bpp.asm
 ./libavcodec/x86/constants.h
@@ -82,7 +82,6 @@
 ./libavcodec/bsf.h
 ./libavcodec/h264dsp.h
 ./libavcodec/imgconvert.c
-./libavcodec/avcodec.symbols
 ./libavcodec/bsf.c
 ./libavcodec/decode.c
 ./libavcodec/decode.h
@@ -102,7 +101,6 @@
 ./libavcodec/blockdsp.h
 ./libavcodec/bytestream.h
 ./libavcodec/codec_desc.c
-./libavcodec/dummy_funcs.c
 ./libavcodec/error_resilience.h
 ./libavcodec/flac.c
 ./libavcodec/flac.h
@@ -172,12 +170,10 @@
 ./libavutil/common.h
 ./libavutil/crc.c
 ./libavutil/dict.h
-./libavutil/display.c
 ./libavutil/error.c
 ./libavutil/error.h
 ./libavutil/eval.h
 ./libavutil/ffmath.h
-./libavutil/fftime.h
 ./libavutil/ffversion.h
 ./libavutil/fifo.c
 ./libavutil/fifo.h
@@ -239,7 +235,6 @@
 ./libavutil/samplefmt.h
 ./libavutil/timestamp.h
 ./libavutil/opt.c
-./libavutil/dummy_funcs.c
 ./libavutil/imgutils_internal.h
 ./libavutil/reverse.h
 ./libavutil/slicethread.c
@@ -249,7 +244,6 @@
 ./libavutil/avstring.c
 ./libavutil/avstring.h
 ./libavutil/avutil.h
-./libavutil/avutil.symbols
 ./libavutil/buffer.c
 ./libavutil/buffer.h
 ./libavutil/buffer_internal.h
diff --git a/media/ffvpx/README_MCP b/media/ffvpx/README_MCP
index de1fdc264..4555e08da 100644
--- a/media/ffvpx/README_MCP
+++ b/media/ffvpx/README_MCP
@@ -37,6 +37,12 @@ $ grep -E ".*_(INDEV|OUTDEV|DECODER|ENCODER|DEMUXER|MUXER|PARSER|FILTER|HWACCEL|
 
 All new decoders/muxers/encoders/... should be added in the list of dummy functions found in libavcodec/dummy_funcs.c
 otherwise linkage will fail on Windows. On other platforms they are optimised out and aren't necessary.
-
-To update the source tree, the files listed in FILES should typically be able to be copied as-is from ffmpeg tree.
+The GNU comm utility is a useful tool to compare and extract only the changes.
+
+To update the source tree, perform a diff on the files listed in FILES.
+The diffs should typically apply to the ffvpx tree.
+e.g. something like this would do:
+Run in the ffmpeg original tree:
+$ for i in `cat $PATH_CENTRAL/media/ffvpx/FILES`; do diff $REV_LASTSYNC HEAD >> patch.diff; done
+Then apply patch.diff on the ffvpx tree.
 Compilation will reveal if any files are missing.
diff --git a/media/ffvpx/libavutil/avconfig.h b/media/ffvpx/libavutil/avconfig.h
index 2ec333d15..f10aa6186 100644
--- a/media/ffvpx/libavutil/avconfig.h
+++ b/media/ffvpx/libavutil/avconfig.h
@@ -3,5 +3,4 @@
 #define AVUTIL_AVCONFIG_H
 #define AV_HAVE_BIGENDIAN 0
 #define AV_HAVE_FAST_UNALIGNED 1
-#define AV_HAVE_INCOMPATIBLE_FORK_ABI 0
 #endif /* AVUTIL_AVCONFIG_H */
diff --git a/media/ffvpx/libavutil/ffversion.h b/media/ffvpx/libavutil/ffversion.h
index cbeaf627b..3da2a6bf1 100644
--- a/media/ffvpx/libavutil/ffversion.h
+++ b/media/ffvpx/libavutil/ffversion.h
@@ -1,5 +1,5 @@
 /* Automatically generated by version.sh, do not manually edit! */
 #ifndef AVUTIL_FFVERSION_H
 #define AVUTIL_FFVERSION_H
-#define FFMPEG_VERSION "n3.1.1-6-g86f9228"
+#define FFMPEG_VERSION "n3.4.2"
 #endif /* AVUTIL_FFVERSION_H */
-- 
cgit v1.2.3