diff options
| author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-29 09:07:42 +0200 |
|---|---|---|
| committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-29 09:07:42 +0200 |
| commit | aff03b0a67c41cf7af5df9c9eef715a8b27a2667 (patch) | |
| tree | aa2909ae4718f81c83c8cfb68c1f5a23485b3173 /media/ffvpx/changes.patch | |
| parent | bdb4ff581677ad1cd411b55a68c87534f9a64882 (diff) | |
| parent | 11caf6ecb3cb8c84d2355a6c6e9580a290147e92 (diff) | |
| download | UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.tar UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.tar.gz UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.tar.lz UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.tar.xz UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into js_dom_performance-resource-timing_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) { |