From 6826cf2faf2692b0bb37780148a89b0e58826f6b Mon Sep 17 00:00:00 2001 From: Loren Merritt Date: Mon, 28 Nov 2005 02:03:12 +0000 Subject: [PATCH] pkg-config: major.minor.patch version git-svn-id: svn://svn.videolan.org/x264/trunk@379 df754926-b1dd-0310-bc7b-ec298dee348c --- common/common.c | 1 + configure | 4 +++- version.sh | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/common/common.c b/common/common.c index d74a28a5..423d63c3 100644 --- a/common/common.c +++ b/common/common.c @@ -131,6 +131,7 @@ void x264_param_default( x264_param_t *param ) memset( param->cqm_8iy, 16, 64 ); memset( param->cqm_8py, 16, 64 ); + param->b_repeat_headers = 1; param->b_aud = 0; } diff --git a/configure b/configure index c578b839..7b7e9c4f 100755 --- a/configure +++ b/configure @@ -273,6 +273,8 @@ EOF echo "default: x264vfw.dll" >> config.mak fi +./version.sh + # x264.pc file creation rm -f x264.pc cat > x264.pc << EOF @@ -283,7 +285,7 @@ includedir=$includedir Name: x264 Description: H.264 (MPEG4 AVC) encoder library -Version: +Version: $(grep POINTVER < config.h | sed -e 's/.* "//; s/".*//') Libs: -L$libdir -lx264 Cflags: -I$includedir EOF diff --git a/version.sh b/version.sh index 8aca7af4..3eb585bb 100755 --- a/version.sh +++ b/version.sh @@ -3,6 +3,10 @@ VER=`svnversion .` if [ "x$VER" != x -a "$VER" != exported ] then echo "#define X264_VERSION \" svn-$VER\"" > config.h + API=`grep '#define X264_BUILD' < x264.h | grep -o '[1-9][0-9]*\>'` + VER=`echo $VER | grep -o '^[0-9]*'` + echo "#define X264_POINTVER \"0.$API.$VER\"" >> config.h else echo "#define X264_VERSION \"\"" > config.h + echo "#define X264_POINTVER \"\"" >> config.h fi -- 2.39.5