Create and install x264_config.h

This header can be used to determine the bit-depth and license of libx264.

diff --git a/Makefile b/Makefile
index ec7a7a3aa6b096e3ac808f5c0d7a260367637297..1e25582aedcbfcfa2d83e755d41b0c6b5d72a7bd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -214,6 +214,7 @@ install: x264$(EXE) $(SONAME)
        install -d $(DESTDIR)$(libdir)
        install -d $(DESTDIR)$(libdir)/pkgconfig
        install -m 644 x264.h $(DESTDIR)$(includedir)
+       install -m 644 x264_config.h $(DESTDIR)$(includedir)
        install -m 644 libx264.a $(DESTDIR)$(libdir)
        install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
        install x264$(EXE) $(DESTDIR)$(bindir)
@@ -227,7 +228,7 @@ endif
        $(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
 
 uninstall:
-       rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(libdir)/libx264.a
+       rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(includedir)/x264_config.h $(DESTDIR)$(libdir)/libx264.a
        rm -f $(DESTDIR)$(bindir)/x264$(EXE) $(DESTDIR)$(libdir)/pkgconfig/x264.pc
        $(if $(SONAME), rm -f $(DESTDIR)$(libdir)/$(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX))
 

diff --git a/common/common.h b/common/common.h
index 43076199321c113f757525dcda8bf2f50a179de0..3c80c0c7a13e5863972a9693d2260e4d685c9aed 100644 (file)
--- a/common/common.h
+++ b/common/common.h
@@ -128,6 +128,8 @@ typedef union { x264_uint128_t i; uint64_t a[2]; uint32_t b[4]; uint16_t c[8]; u
 #   define MPIXEL_X4(src) M32(src)
 #endif
 
+#define BIT_DEPTH X264_BIT_DEPTH
+
 #define CPPIXEL_X4(dst,src) MPIXEL_X4(dst) = MPIXEL_X4(src)
 
 #define X264_SCAN8_SIZE (6*8)

diff --git a/configure b/configure
index 27e9e69f5e5ecf0aa853d529440384a8cb962246..9cd777034143d8d79a34bd385514244ed36ad1b3 100755 (executable)
--- a/configure
+++ b/configure
@@ -138,7 +138,7 @@ die() {
     exit 1
 }
 
-rm -f config.h config.mak config.log x264.pc conftest*
+rm -f x264_config.h config.h config.mak config.log x264.pc conftest*
 
 prefix='/usr/local'
 exec_prefix='${prefix}'
@@ -735,10 +735,9 @@ if [ "$bit_depth" -gt "8" ]; then
     ASFLAGS="$ASFLAGS -DHIGH_BIT_DEPTH"
 fi
 
-define BIT_DEPTH $bit_depth
 ASFLAGS="$ASFLAGS -DBIT_DEPTH=$bit_depth"
 
-[ $gpl = yes ] && define HAVE_GPL
+[ $gpl = yes ] && define HAVE_GPL && x264_gpl=1 || x264_gpl=0
 
 #define undefined vars as 0
 for var in $CONFIG_HAVE; do
@@ -747,6 +746,13 @@ done
 
 rm -f conftest*
 
+# generate exported config file
+
+cat > x264_config.h << EOF
+#define X264_BIT_DEPTH $bit_depth
+#define X264_GPL       $x264_gpl
+EOF
+
 # generate config files
 
 cat > config.mak << EOF

diff --git a/x264.h b/x264.h
index b300f27d01835f1515ee806b053aa146b4f01f3a..631de0adadb881c91e503aaf47499e35ede5a879 100644 (file)
--- a/x264.h
+++ b/x264.h
@@ -39,6 +39,8 @@
 
 #include <stdarg.h>
 
+#include "x264_config.h"
+
 #define X264_BUILD 110
 
 /* x264_t: