diff options
author | Moonchild <mcwerewolf@gmail.com> | 2018-04-27 19:15:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-27 19:15:26 +0200 |
commit | c75dae3ed21bfa5a8ae46cd83d18329af5bea05a (patch) | |
tree | ef657c38feb2368a3c86765778d1f068aa5eb614 /media/ffvpx/config_common.h | |
parent | c82c6d960a7f19d6595171f9705c43514f20c1ec (diff) | |
parent | 6ada4b14e4cfc91f5f1b2556623cab691f3ab813 (diff) | |
download | UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.tar UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.tar.gz UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.tar.lz UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.tar.xz UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.zip |
Merge pull request #275 from trav90/ffvpx-resync
Resync ffvpx code with 3.4.2-release from upstream
Diffstat (limited to 'media/ffvpx/config_common.h')
-rw-r--r-- | media/ffvpx/config_common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/ffvpx/config_common.h b/media/ffvpx/config_common.h index 6ee60762f..dd3b3e170 100644 --- a/media/ffvpx/config_common.h +++ b/media/ffvpx/config_common.h @@ -1,3 +1,4 @@ #ifndef MOZ_FFVPX_CONFIG_COMMON_H #define MOZ_FFVPX_CONFIG_COMMON_H +#include "defaults_disabled.h" #endif |