From 5f8de423f190bbb79a62f804151bc24824fa32d8 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 2 Feb 2018 04:16:08 -0500 Subject: Add m-esr52 at 52.6.0 --- media/ffvpx/changes.patch | 65 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 media/ffvpx/changes.patch (limited to 'media/ffvpx/changes.patch') diff --git a/media/ffvpx/changes.patch b/media/ffvpx/changes.patch new file mode 100644 index 000000000..9cb49afaf --- /dev/null +++ b/media/ffvpx/changes.patch @@ -0,0 +1,65 @@ +diff --git a/media/ffvpx/libavutil/eval.c b/media/ffvpx/libavutil/eval.c +index 7642b91..e938bd5 100644 +--- a/media/ffvpx/libavutil/eval.c ++++ b/media/ffvpx/libavutil/eval.c +@@ -34,7 +34,7 @@ + #include "internal.h" + #include "log.h" + #include "mathematics.h" +-#include "time.h" ++#include "fftime.h" + #include "avstring.h" + #include "timer.h" + +diff --git a/media/ffvpx/libavutil/time.h b/media/ffvpx/libavutil/fftime.h +similarity index 100% +rename from media/ffvpx/libavutil/time.h +rename to media/ffvpx/libavutil/fftime.h +diff --git a/media/ffvpx/libavutil/time.c b/media/ffvpx/libavutil/time.c +index dbaee02..69419e6 100644 +--- a/media/ffvpx/libavutil/time.c ++++ b/media/ffvpx/libavutil/time.c +@@ -33,7 +33,7 @@ + #include + #endif + +-#include "time.h" ++#include "fftime.h" + #include "error.h" + + int64_t av_gettime(void) +diff --git a/media/ffvpx/libavutil/parseutils.c b/media/ffvpx/libavutil/parseutils.c +index 9fb8d0a..97ad3b9 100644 +--- a/media/ffvpx/libavutil/parseutils.c ++++ b/media/ffvpx/libavutil/parseutils.c +@@ -28,7 +28,7 @@ + #include "common.h" + #include "eval.h" + #include "log.h" +-#include "random_seed.h" ++/* #include "random_seed.h" */ + #include "time_internal.h" + #include "parseutils.h" + +@@ -367,7 +367,7 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen, + rgba_color[3] = 255; + + if (!av_strcasecmp(color_string2, "random") || !av_strcasecmp(color_string2, "bikeshed")) { +- int rgba = av_get_random_seed(); ++ int rgba = 0xffffffff; /* av_get_random_seed(); */ + rgba_color[0] = rgba >> 24; + rgba_color[1] = rgba >> 16; + rgba_color[2] = rgba >> 8; +diff --git a/media/ffvpx/libavcodec/options.c b/media/ffvpx/libavcodec/options.c +index d8e3dbf..f25df2a 100644 +--- a/media/ffvpx/libavcodec/options.c ++++ b/media/ffvpx/libavcodec/options.c +@@ -34,7 +34,7 @@ + #include + + FF_DISABLE_DEPRECATION_WARNINGS +-#include "options_table.h" ++#include "ff_options_table.h" + FF_ENABLE_DEPRECATION_WARNINGS + + static const char* context_to_name(void* ptr) { -- cgit v1.2.3