diff options
author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-28 07:38:20 +0200 |
---|---|---|
committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-28 07:38:20 +0200 |
commit | 6b2bba06b433fb75979ab6daf7bbe8bc76c53875 (patch) | |
tree | 75803b4683889e6e0d2a3faef30415db3ff7b3ba /media/ffvpx/changes.patch | |
parent | 72def35cd0cf3649b6d7ab72b66117df3e1c33fc (diff) | |
parent | c75dae3ed21bfa5a8ae46cd83d18329af5bea05a (diff) | |
download | UXP-6b2bba06b433fb75979ab6daf7bbe8bc76c53875.tar UXP-6b2bba06b433fb75979ab6daf7bbe8bc76c53875.tar.gz UXP-6b2bba06b433fb75979ab6daf7bbe8bc76c53875.tar.lz UXP-6b2bba06b433fb75979ab6daf7bbe8bc76c53875.tar.xz UXP-6b2bba06b433fb75979ab6daf7bbe8bc76c53875.zip |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into pm_url_1
Diffstat (limited to 'media/ffvpx/changes.patch')
-rw-r--r-- | media/ffvpx/changes.patch | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/media/ffvpx/changes.patch b/media/ffvpx/changes.patch index 9cb49afaf..49a49b26b 100644 --- a/media/ffvpx/changes.patch +++ b/media/ffvpx/changes.patch @@ -50,16 +50,3 @@ index 9fb8d0a..97ad3b9 100644 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 <string.h> - - 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) { |