[SCM] x264 packaging branch, ubuntu, updated. debian/0.85.1448+git1a6d32-3-12-g0f64f26

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit afcbe006fe47eb9624697a5d2c0f57827005ad07
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jul 19 22:20:05 2010 +0200

    remove file deleted during build

diff --git a/config.h b/config.h
deleted file mode 100644
index fce4552..0000000
--- a/config.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#define HAVE_MALLOC_H
-#define HAVE_MMX
-#define ARCH_X86
-#define SYS_LINUX
-#define HAVE_PTHREAD
-#define HAVE_LOG2F
-#define MP4_OUTPUT
-#define fseek fseeko
-#define ftell ftello
-#define X264_VERSION " r40+55 726fedf"
-#define X264_POINTVER "0.85.40+55 726fedf"
diff --git a/config.log b/config.log
deleted file mode 100644
index f365398..0000000
--- a/config.log
+++ /dev/null
@@ -1,53 +0,0 @@
-x264 configure script
-
-checking whether gcc works... yes
-checking for -std=gnu99... yes
-checking whether yasm supports lzcnt eax, eax... yes
-checking whether gcc supports __asm__("pabsw %xmm0, %xmm0");... yes
-checking for pthread.h... yes
-checking for return log2f(2); in math.h... yes
-checking for libavformat/avformat.h... yes
-checking for libswscale/swscale.h... yes
-checking for avcodec_decode_video2( NULL, NULL, NULL, NULL ); in libavformat/avformat.h... no
-Failed commandline was:
---------------------------------------------------
-gcc conftest.c  -Wall -I. -march=i686 -mfpmath=sse -msse -std=gnu99  -lm -lpthread     -L.  -lavformat -lavcodec -lswscale  
-conftest.c: In function 'main':
-conftest.c:2: warning: implicit declaration of function 'avcodec_decode_video2'
-/tmp/ccX6qw50.o: In function `main':
-conftest.c:(.text+0x29): undefined reference to `avcodec_decode_video2'
-collect2: ld returned 1 exit status
---------------------------------------------------
-checking for FFMS_DestroyVideoSource(0); in ffms.h... no
-Failed commandline was:
---------------------------------------------------
-gcc conftest.c  -Wall -I. -march=i686 -mfpmath=sse -msse -std=gnu99  -lm -lpthread   -lffms2
-conftest.c:1:18: error: ffms.h: No such file or directory
-conftest.c: In function 'main':
-conftest.c:2: warning: implicit declaration of function 'FFMS_DestroyVideoSource'
---------------------------------------------------
-checking for FFMS_DestroyVideoSource(0); in ffms.h... no
-Failed commandline was:
---------------------------------------------------
-gcc conftest.c  -Wall -I. -march=i686 -mfpmath=sse -msse -std=gnu99  -lm -lpthread   -lffms2 -lstdc++ -L.  -lavformat -lavcodec -lswscale  
-conftest.c:1:18: error: ffms.h: No such file or directory
-conftest.c: In function 'main':
-conftest.c:2: warning: implicit declaration of function 'FFMS_DestroyVideoSource'
---------------------------------------------------
-checking for gpac/isomedia.h... yes
-checking for gf_isom_set_pixel_aspect_ratio(0,0,0,0,0); in gpac/isomedia.h... yes
-checking for fseeko(stdin,0,0); in stdio.h... yes
-
-Platform:   X86
-System:     LINUX
-asm:        yes
-avs input:  no
-lavf input: no
-ffms input: no
-mp4 output: yes
-pthread:    yes
-debug:      no
-gprof:      no
-PIC:        no
-shared:     no
-visualize:  no
diff --git a/config.mak b/config.mak
deleted file mode 100644
index 8cb2a2d..0000000
--- a/config.mak
+++ /dev/null
@@ -1,20 +0,0 @@
-prefix=/usr/local
-exec_prefix=${prefix}
-bindir=${exec_prefix}/bin
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-ARCH=X86
-SYS=LINUX
-CC=gcc
-CFLAGS=-O3 -ffast-math  -Wall -I. -march=i686 -mfpmath=sse -msse -std=gnu99 -s -fomit-frame-pointer
-LDFLAGS= -lm -lpthread -s
-LDFLAGSCLI= -lgpac_static
-AR=ar
-RANLIB=ranlib
-STRIP=strip
-AS=yasm
-ASFLAGS= -O2 -f elf
-EXE=
-VIS=no
-HAVE_GETOPT_LONG=1
-DEVNULL=/dev/null
diff --git a/x264.pc b/x264.pc
deleted file mode 100644
index 20fca4e..0000000
--- a/x264.pc
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=/usr/local
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: x264
-Description: H.264 (MPEG4 AVC) encoder library
-Version: 0.85.40+55 726fedf
-Libs: -L${exec_prefix}/lib -lx264 -lpthread
-Cflags: -I${prefix}/include

-- 
x264 packaging