vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Thu Sep 29 13:23:00 2016 +0200| [d5843a0ef15fa64740025b604bbb38e9415b2de6] | committer: Hugo Beauzée-Luyssen
contribs: vpx: Fix VLC build when building libvpx without encoder > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d5843a0ef15fa64740025b604bbb38e9415b2de6 --- contrib/src/vpx/libvpx-noencoder.patch | 26 ++++++++++++++++++++++++++ contrib/src/vpx/rules.mak | 1 + 2 files changed, 27 insertions(+) diff --git a/contrib/src/vpx/libvpx-noencoder.patch b/contrib/src/vpx/libvpx-noencoder.patch new file mode 100644 index 0000000..27f9e4d --- /dev/null +++ b/contrib/src/vpx/libvpx-noencoder.patch @@ -0,0 +1,26 @@ +--- libvpx/vpx/vpx_encoder.h.orig 2016-09-29 13:16:43.275060163 +0200 ++++ libvpx/vpx/vpx_encoder.h 2016-09-29 13:17:25.606960648 +0200 +@@ -83,10 +83,6 @@ + */ + #define VPX_CODEC_CAP_OUTPUT_PARTITION 0x20000 + +-/*! Can support input images at greater than 8 bitdepth. +- */ +-#define VPX_CODEC_CAP_HIGHBITDEPTH 0x40000 +- + /*! \brief Initialization-time Feature Enabling + * + * Certain codec features must be known at initialization time, to allow + +--- libvpx/vpx/vpx_codec.h.orig 2016-09-29 13:17:21.970969167 +0200 ++++ libvpx/vpx/vpx_codec.h 2016-09-29 13:17:57.098887090 +0200 +@@ -154,6 +154,9 @@ + #define VPX_CODEC_CAP_DECODER 0x1 /**< Is a decoder */ + #define VPX_CODEC_CAP_ENCODER 0x2 /**< Is an encoder */ + ++/*! Can support input images at greater than 8 bitdepth. ++ */ ++#define VPX_CODEC_CAP_HIGHBITDEPTH 0x40000 + + /*! \brief Initialization-time Feature Enabling + * diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak index 5b769e4..104cbc1 100644 --- a/contrib/src/vpx/rules.mak +++ b/contrib/src/vpx/rules.mak @@ -18,6 +18,7 @@ libvpx: libvpx-$(VPX_VERSION).tar.bz2 .sum-vpx $(APPLY) $(SRC)/vpx/libvpx-mac.patch $(APPLY) $(SRC)/vpx/libvpx-ios.patch $(APPLY) $(SRC)/vpx/libvpx-arm.patch + $(APPLY) $(SRC)/vpx/libvpx-noencoder.patch ifdef HAVE_ANDROID $(APPLY) $(SRC)/vpx/libvpx-android.patch endif _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
