libx264-acam.patch

   1 diff -Nur x264-snapshot-20051022-2245.orig/common/amd64/Makefile.am x264-snapshot-20051022-2245/common/amd64/Makefile.am
   2 --- x264-snapshot-20051022-2245.orig/common/amd64/Makefile.am   1970-01-01 01:00:00.000000000 +0100
   3 +++ x264-snapshot-20051022-2245/common/amd64/Makefile.am        2005-10-24 01:18:29.134240048 +0200
   4 @@ -0,0 +1,19 @@
   5 +SUFFIXES = .c .o .lo .asm
   6 +
   7 +YASM=@YASM@
   8 +YASMFLAGS=@YASMFLAGS@
   9 +LINK = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_LDFLAGS) $(LDFLAGS) -o $@
  10 +
  11 +noinst_LTLIBRARIES = lib_x8664_yasm.la
  12 +
  13 +lib_x8664_yasm_la_SOURCES = dct-a.asm cpu-a.asm pixel-a.asm mc-a.asm \
  14 +       mc-a2.asm predict-a.asm pixel-sse2.asm quant-a.asm
  15 +
  16 +am_lib_x8664_yasm_la_OBJECTS = dct-a.lo cpu-a.lo pixel-a.lo mc-a.lo \
  17 +       mc-a2.lo predict-a.lo pixel-sse2.lo quant-a.lo
  18 +
  19 +.asm.o: $<
  20 +       $(YASM) $(YASMFLAGS) $< -o $@
  21 +
  22 +.asm.lo: $<
  23 +       $(LIBTOOL) --mode=compile --tag=CC sh $(top_srcdir)/strip_fPIC.sh $(YASM) $(YASMFLAGS) $< -o $@
  24 diff -Nur x264-snapshot-20051022-2245.orig/common/common.c x264-snapshot-20051022-2245/common/common.c
  25 --- x264-snapshot-20051022-2245.orig/common/common.c    2005-10-22 22:45:02.000000000 +0200
  26 +++ x264-snapshot-20051022-2245/common/common.c 2005-10-23 23:17:53.281256904 +0200
  27 @@ -21,6 +21,10 @@
  28   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  29   *****************************************************************************/
  30
  31 +#ifdef HAVE_CONFIG_H
  32 +#include "config.h"
  33 +#endif
  34 +
  35  #include <stdlib.h>
  36  #include <stdio.h>
  37  #include <string.h>
  38 diff -Nur x264-snapshot-20051022-2245.orig/common/common.h x264-snapshot-20051022-2245/common/common.h
  39 --- x264-snapshot-20051022-2245.orig/common/common.h    2005-10-22 22:45:02.000000000 +0200
  40 +++ x264-snapshot-20051022-2245/common/common.h 2005-10-23 22:36:41.745987376 +0200
  41 @@ -24,6 +24,10 @@
  42  #ifndef _COMMON_H
  43  #define _COMMON_H 1
  44
  45 +#ifdef HAVE_CONFIG_H
  46 +#include "config.h"
  47 +#endif
  48 +
  49  #ifdef HAVE_STDINT_H
  50  #include <stdint.h>
  51  #else
  52 diff -Nur x264-snapshot-20051022-2245.orig/common/cpu.c x264-snapshot-20051022-2245/common/cpu.c
  53 --- x264-snapshot-20051022-2245.orig/common/cpu.c       2005-10-22 22:45:02.000000000 +0200
  54 +++ x264-snapshot-20051022-2245/common/cpu.c    2005-10-23 22:36:58.382458248 +0200
  55 @@ -21,6 +21,10 @@
  56   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  57   *****************************************************************************/
  58
  59 +#ifdef HAVE_CONFIG_H
  60 +#include "config.h"
  61 +#endif
  62 +
  63  #ifdef HAVE_STDINT_H
  64  #include <stdint.h>
  65  #else
  66 diff -Nur x264-snapshot-20051022-2245.orig/common/dct.c x264-snapshot-20051022-2245/common/dct.c
  67 --- x264-snapshot-20051022-2245.orig/common/dct.c       2005-10-22 22:45:02.000000000 +0200
  68 +++ x264-snapshot-20051022-2245/common/dct.c    2005-10-23 22:37:13.619141920 +0200
  69 @@ -21,6 +21,10 @@
  70   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  71   *****************************************************************************/
  72
  73 +#ifdef HAVE_CONFIG_H
  74 +#include "config.h"
  75 +#endif
  76 +
  77  #ifdef HAVE_STDINT_H
  78  #include <stdint.h>
  79  #else
  80 diff -Nur x264-snapshot-20051022-2245.orig/common/i386/dct-c.c x264-snapshot-20051022-2245/common/i386/dct-c.c
  81 --- x264-snapshot-20051022-2245.orig/common/i386/dct-c.c        2005-10-22 22:45:02.000000000 +0200
  82 +++ x264-snapshot-20051022-2245/common/i386/dct-c.c     2005-10-23 22:38:11.646320448 +0200
  83 @@ -21,6 +21,10 @@
  84   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  85   *****************************************************************************/
  86
  87 +#ifdef HAVE_CONFIG_H
  88 +#include "config.h"
  89 +#endif
  90 +
  91  #ifdef HAVE_STDINT_H
  92  #include <stdint.h>
  93  #else
  94 diff -Nur x264-snapshot-20051022-2245.orig/common/i386/Makefile.am x264-snapshot-20051022-2245/common/i386/Makefile.am
  95 --- x264-snapshot-20051022-2245.orig/common/i386/Makefile.am    1970-01-01 01:00:00.000000000 +0100
  96 +++ x264-snapshot-20051022-2245/common/i386/Makefile.am 2005-10-24 00:44:08.981430880 +0200
  97 @@ -0,0 +1,26 @@
  98 +SUFFIXES = .c .o .lo .asm
  99 +
 100 +NASM=@NASM@
 101 +NASMFLAGS=@NASMFLAGS@
 102 +
 103 +if CPU_i386
 104 +noinst_LTLIBRARIES = lib_x86.la lib_i386_nasm.la
 105 +else
 106 +noinst_LTLIBRARIES = lib_x86.la
 107 +endif
 108 +
 109 +noinst_HEADERS = dct.h mc.h pixel.h predict.h
 110 +
 111 +lib_x86_la_SOURCES = mc-c.c dct-c.c predict.c
 112 +
 113 +lib_i386_nasm_la_SOURCES = dct-a.asm cpu-a.asm pixel-a.asm mc-a.asm \
 114 +       mc-a2.asm predict-a.asm pixel-sse2.asm quant-a.asm
 115 +
 116 +am_lib_i386_nasm_la_OBJECTS = dct-a.lo cpu-a.lo pixel-a.lo mc-a.lo \
 117 +       mc-a2.lo predict-a.lo pixel-sse2.lo quant-a.lo
 118 +
 119 +.asm.o: $<
 120 +       $(NASM) $(NASMFLAGS) $< -o $@
 121 +
 122 +.asm.lo: $<
 123 +       $(LIBTOOL) --mode=compile --tag=CC sh $(top_srcdir)/strip_fPIC.sh $(NASM) $(NASMFLAGS) $< -o $@
 124 diff -Nur x264-snapshot-20051022-2245.orig/common/i386/mc-c.c x264-snapshot-20051022-2245/common/i386/mc-c.c
 125 --- x264-snapshot-20051022-2245.orig/common/i386/mc-c.c 2005-10-22 22:45:02.000000000 +0200
 126 +++ x264-snapshot-20051022-2245/common/i386/mc-c.c      2005-10-23 22:45:25.266400176 +0200
 127 @@ -21,6 +21,10 @@
 128   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
 129   *****************************************************************************/
 130
 131 +#ifdef HAVE_CONFIG_H
 132 +#include "config.h"
 133 +#endif
 134 +
 135  #ifdef HAVE_STDINT_H
 136  #include <stdint.h>
 137  #else
 138 diff -Nur x264-snapshot-20051022-2245.orig/common/i386/predict.c x264-snapshot-20051022-2245/common/i386/predict.c
 139 --- x264-snapshot-20051022-2245.orig/common/i386/predict.c      2005-10-22 22:45:02.000000000 +0200
 140 +++ x264-snapshot-20051022-2245/common/i386/predict.c   2005-10-23 22:45:59.850142648 +0200
 141 @@ -24,6 +24,10 @@
 142  /* XXX predict4x4 are inspired from ffmpeg h264 decoder
 143   */
 144
 145 +#ifdef HAVE_CONFIG_H
 146 +#include "config.h"
 147 +#endif
 148 +
 149  #ifdef HAVE_STDINT_H
 150  #include <stdint.h>
 151  #else
 152 diff -Nur x264-snapshot-20051022-2245.orig/common/Makefile.am x264-snapshot-20051022-2245/common/Makefile.am
 153 --- x264-snapshot-20051022-2245.orig/common/Makefile.am 1970-01-01 01:00:00.000000000 +0100
 154 +++ x264-snapshot-20051022-2245/common/Makefile.am      2005-10-24 01:27:56.205032184 +0200
 155 @@ -0,0 +1,53 @@
 156 +if CPU_i386
 157 +i386_subdir = i386
 158 +i386_LIB = $(top_builddir)/common/i386/lib_x86.la $(top_builddir)/common/i386/lib_i386_nasm.la
 159 +else
 160 +i386_subdir =
 161 +i386_LIB =
 162 +endif
 163 +
 164 +if CPU_x8664
 165 +x8664_subdir = i386 amd64
 166 +x8664_LIB = $(top_builddir)/common/i386/lib_x86.la $(top_builddir)/common/amd64/lib_x8664_yasm.la
 167 +else
 168 +x8664_subdir =
 169 +x8664_LIB =
 170 +endif
 171 +
 172 +if CPU_ppc
 173 +ppc_subdir = ppc
 174 +ppc_LIB = $(top_srcdir)/common/ppc/lib_ppc.la
 175 +else
 176 +ppc_subdir =
 177 +ppc_LIB =
 178 +endif
 179 +
 180 +if CPU_sparc
 181 +sparc_subdir = sparc
 182 +sparc_LIB = $(top_srcdir)/common/sparc/lib_sparc.la
 183 +else
 184 +sparc_subdir =
 185 +sparc_LIB =
 186 +endif
 187 +
 188 +SUBDIRS = $(i386_subdir) $(x8664_subdir) $(ppc_subdir) $(sparc_subdir)
 189 +
 190 +common_SRCS = mc.c predict.c pixel.c macroblock.c \
 191 +       frame.c dct.c cpu.c cabac.c \
 192 +       common.c mdate.c csp.c set.c \
 193 +       quant.c
 194 +
 195 +if VIS
 196 +vis_SRCS = common/visualize.c common/display-x11.c
 197 +else
 198 +vis_SRCS =
 199 +endif
 200 +
 201 +noinst_HEADERS = bs.h cabac.h clip1.h common.h cpu.h csp.h dct.h display.h \
 202 +       frame.h macroblock.h mc.h pixel.h predict.h quant.h set.h visualize.h \
 203 +       vlc.h
 204 +
 205 +noinst_LTLIBRARIES = lib_common.la
 206 +
 207 +lib_common_la_SOURCES = $(common_SRCS) $(vis_SRCS)
 208 +lib_common_la_LIBADD = $(i386_LIB) $(x8664_LIB) $(ppc_LIB) $(sparc_LIB)
 209 diff -Nur x264-snapshot-20051022-2245.orig/common/mc.c x264-snapshot-20051022-2245/common/mc.c
 210 --- x264-snapshot-20051022-2245.orig/common/mc.c        2005-10-22 22:45:02.000000000 +0200
 211 +++ x264-snapshot-20051022-2245/common/mc.c     2005-10-23 23:15:59.521551008 +0200
 212 @@ -21,6 +21,10 @@
 213   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
 214   *****************************************************************************/
 215
 216 +#ifdef HAVE_CONFIG_H
 217 +#include "config.h"
 218 +#endif
 219 +
 220  #ifdef HAVE_STDINT_H
 221  #include <stdint.h>
 222  #else
 223 diff -Nur x264-snapshot-20051022-2245.orig/common/mdate.c x264-snapshot-20051022-2245/common/mdate.c
 224 --- x264-snapshot-20051022-2245.orig/common/mdate.c     2005-10-22 22:45:02.000000000 +0200
 225 +++ x264-snapshot-20051022-2245/common/mdate.c  2005-10-23 23:16:44.309742168 +0200
 226 @@ -21,6 +21,10 @@
 227   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
 228   *****************************************************************************/
 229
 230 +#ifdef HAVE_CONFIG_H
 231 +#include "config.h"
 232 +#endif
 233 +
 234  #ifdef HAVE_STDINT_H
 235  #include <stdint.h>
 236  #else
 237 diff -Nur x264-snapshot-20051022-2245.orig/common/pixel.c x264-snapshot-20051022-2245/common/pixel.c
 238 --- x264-snapshot-20051022-2245.orig/common/pixel.c     2005-10-22 22:45:02.000000000 +0200
 239 +++ x264-snapshot-20051022-2245/common/pixel.c  2005-10-23 23:16:49.766912552 +0200
 240 @@ -21,6 +21,10 @@
 241   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
 242   *****************************************************************************/
 243
 244 +#ifdef HAVE_CONFIG_H
 245 +#include "config.h"
 246 +#endif
 247 +
 248  #ifdef HAVE_STDINT_H
 249  #include <stdint.h>
 250  #else
 251 diff -Nur x264-snapshot-20051022-2245.orig/common/ppc/Makefile.am x264-snapshot-20051022-2245/common/ppc/Makefile.am
 252 --- x264-snapshot-20051022-2245.orig/common/ppc/Makefile.am     1970-01-01 01:00:00.000000000 +0100
 253 +++ x264-snapshot-20051022-2245/common/ppc/Makefile.am  2005-10-23 23:01:25.817374232 +0200
 254 @@ -0,0 +1,5 @@
 255 +noinst_LTLIBRARIES = lib_ppc.la
 256 +
 257 +noinst_HEADERS = mc.h pixel.h ppccommon.h
 258 +
 259 +lib_ppc_la_SOURCES = mc.c pixel.c dct.c
 260 diff -Nur x264-snapshot-20051022-2245.orig/common/predict.c x264-snapshot-20051022-2245/common/predict.c
 261 --- x264-snapshot-20051022-2245.orig/common/predict.c   2005-10-22 22:45:02.000000000 +0200
 262 +++ x264-snapshot-20051022-2245/common/predict.c        2005-10-23 23:16:54.594178696 +0200
 263 @@ -24,6 +24,10 @@
 264  /* XXX predict4x4 are inspired from ffmpeg h264 decoder
 265   */
 266
 267 +#ifdef HAVE_CONFIG_H
 268 +#include "config.h"
 269 +#endif
 270 +
 271  #ifdef HAVE_STDINT_H
 272  #include <stdint.h>
 273  #else
 274 diff -Nur x264-snapshot-20051022-2245.orig/common/sparc/Makefile.am x264-snapshot-20051022-2245/common/sparc/Makefile.am
 275 --- x264-snapshot-20051022-2245.orig/common/sparc/Makefile.am   1970-01-01 01:00:00.000000000 +0100
 276 +++ x264-snapshot-20051022-2245/common/sparc/Makefile.am        2005-10-23 23:03:09.936545712 +0200
 277 @@ -0,0 +1,7 @@
 278 +SUFFIXES = .lo .asm
 279 +
 280 +noinst_LTLIBRARIES = lib_sparc.la
 281 +
 282 +noinst_HEADERS = pixel.h
 283 +
 284 +lib_sparc_la_SOURCES = pixel.asm
 285 diff -Nur x264-snapshot-20051022-2245.orig/common/visualize.c x264-snapshot-20051022-2245/common/visualize.c
 286 --- x264-snapshot-20051022-2245.orig/common/visualize.c 2005-10-22 22:45:02.000000000 +0200
 287 +++ x264-snapshot-20051022-2245/common/visualize.c      2005-10-23 23:18:48.564852520 +0200
 288 @@ -39,6 +39,10 @@
 289   * pink blocks with a diagonal line are predicted using the planar function.
 290   */
 291
 292 +#ifdef HAVE_CONFIG_H
 293 +#include "config.h"
 294 +#endif
 295 +
 296  #ifdef HAVE_STDINT_H
 297  #include <stdint.h>
 298  #else
 299 diff -Nur x264-snapshot-20051022-2245.orig/configure.ac x264-snapshot-20051022-2245/configure.ac
 300 --- x264-snapshot-20051022-2245.orig/configure.ac       1970-01-01 01:00:00.000000000 +0100
 301 +++ x264-snapshot-20051022-2245/configure.ac    2005-10-24 01:03:37.053856880 +0200
 302 @@ -0,0 +1,140 @@
 303 +AC_INIT(libx264, 0.1.2)
 304 +AC_PREREQ(2.53)
 305 +AC_CONFIG_SRCDIR([x264.c])
 306 +AC_CANONICAL_HOST
 307 +AC_CANONICAL_TARGET
 308 +
 309 +AM_INIT_AUTOMAKE
 310 +
 311 +AM_CONFIG_HEADER([config.h])
 312 +
 313 +# Checks for programs.
 314 +AC_PROG_AWK
 315 +AC_PROG_CC
 316 +#AC_PROG_CXX
 317 +AC_PROG_INSTALL
 318 +AC_PROG_LN_S
 319 +AC_PROG_MAKE_SET
 320 +AC_LIBTOOL_DLOPEN
 321 +AC_PROG_LIBTOOL
 322 +AC_PATH_PROG(NASM,nasm)
 323 +AC_PATH_PROG(YASM,yasm)
 324 +
 325 +# Checks for header files.
 326 +AC_HEADER_STDC
 327 +AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h malloc.h stddef.h stdint.h stdlib.h string.h sys/time.h sys/timeb.h])
 328 +
 329 +# Checks for typedefs, structures, and compiler characteristics.
 330 +AC_C_CONST
 331 +AC_C_INLINE
 332 +AC_TYPE_SIZE_T
 333 +AC_HEADER_TIME
 334 +
 335 +AC_DEFINE_UNQUOTED(X264_VERSION,["333M"],[X264 version])
 336 +
 337 +AH_TEMPLATE([CPU_i386],
 338 +            [Define as 1 if host is an IA32])
 339 +
 340 +AH_TEMPLATE([CPU_x8664],
 341 +            [Define as 1 if host is an X86_64])
 342 +
 343 +AH_TEMPLATE([ARCH_X86],
 344 +            [Define as 1 if host is a x86])
 345 +
 346 +AH_TEMPLATE([ARCH_X86_64],
 347 +            [Define as 1 if host is a x86_64])
 348 +
 349 +AH_TEMPLATE([ARCH_PPC],
 350 +            [Define as 1 if host is a ppc])
 351 +
 352 +AH_TEMPLATE([HAVE_MMXEXT],
 353 +            [Define as 1 if host supports MMX extensions])
 354 +
 355 +AH_TEMPLATE([HAVE_SSE2],
 356 +            [Define as 1 if host supports SSE2 extensions])
 357 +
 358 +AH_TEMPLATE([CPU_ppc],
 359 +            [Define as 1 if host is a ppc])
 360 +
 361 +AH_TEMPLATE([CPU_sparc],
 362 +            [Define as 1 if host is a sparc])
 363 +
 364 +AC_DEFINE(SYS_LINUX,1,[Define as 1 if os is Linux])
 365 +
 366 +cputype=""
 367 +case "$target_cpu" in
 368 +       i?86)
 369 +               AC_DEFINE(CPU_i386,1)
 370 +               AC_SUBST(CPU_i386)
 371 +               AC_DEFINE(ARCH_X86,1)
 372 +               AC_SUBST(ARCH_X86)
 373 +               AC_DEFINE(HAVE_MMXEXT,1)
 374 +               AC_SUBST(HAVE_MMXEXT)
 375 +               AC_DEFINE(HAVE_SSE2,1)
 376 +               AC_SUBST(HAVE_SSE2)
 377 +               NASMFLAGS="-f elf"
 378 +               cputype="x86"
 379 +               if test x"$NASM" = "x"; then
 380 +                       AC_MSG_ERROR(nasm required for x86 build. Please Install it.)
 381 +               fi
 382 +               ;;
 383 +       x86_64-NOTREADY)
 384 +               AC_DEFINE(CPU_x8664,1)
 385 +               AC_SUBST(CPU_x8664)
 386 +               AC_DEFINE(ARCH_X86_64,1)
 387 +               AC_SUBST(ARCH_X86_64)
 388 +               AC_DEFINE(HAVE_MMXEXT,1)
 389 +               AC_SUBST(HAVE_MMXEXT)
 390 +               AC_DEFINE(HAVE_SSE2,1)
 391 +               AC_SUBST(HAVE_SSE2)
 392 +               YASMFLAGS="-f elf -m amd64"
 393 +               cputype="x8664"
 394 +               if test x"$YASM" = "x"; then
 395 +                       AC_MSG_ERROR(yasm required for x86_64 build. Please Install it.)
 396 +               fi
 397 +               ;;
 398 +       powerpc)
 399 +               AC_DEFINE(CPU_ppc,1)
 400 +               AC_SUBST(CPU_ppc)
 401 +               AC_DEFINE(ARCH_PPC,1)
 402 +               AC_SUBST(ARCH_PPC)
 403 +               cputype="ppc"
 404 +               CFLAGS="$CFLAGS -maltivec -mabi=altivec"
 405 +               ;;
 406 +esac
 407 +
 408 +AC_SUBST(NASMFLAGS)
 409 +AC_SUBST(YASMFLAGS)
 410 +
 411 +AM_CONDITIONAL(CPU_i386,[ test "$cputype" = "x86" ])
 412 +AM_CONDITIONAL(CPU_x8664,[ test "$cputype" = "x8664" ])
 413 +AM_CONDITIONAL(CPU_ppc,[ test "$cputype" = "ppc" ])
 414 +dnl Solaris only?
 415 +AM_CONDITIONAL(CPU_sparc,[ false ])
 416 +
 417 +# Checks for library functions.
 418 +AC_FUNC_MALLOC
 419 +AC_FUNC_MEMCMP
 420 +AC_TYPE_SIGNAL
 421 +AC_FUNC_STRTOD
 422 +AC_FUNC_VPRINTF
 423 +AC_CHECK_FUNCS([gettimeofday memmove memset pow sqrt strcasecmp strchr strdup strstr strtol])
 424 +
 425 +AC_ARG_ENABLE(visualize, [--enable-visualize   enable visualization],[vis="$enableval"],[vis=no])
 426 +if test "$vis" = "yes" ; then
 427 +       AC_PATH_XTRA
 428 +       LDFLAGS="$LDFLAGS $X_LIBS -lX11"
 429 +       AC_DEFINE(VISUALIZE,1,[Define as 1 to get visualization])
 430 +       CFLAGS="$CFLAGS $X_CFLAGS"
 431 +fi
 432 +AM_CONDITIONAL(VIS, [test "$vis" = "yes"])
 433 +
 434 +AC_CONFIG_FILES([Makefile
 435 +                 common/Makefile
 436 +                                common/amd64/Makefile
 437 +                                common/i386/Makefile
 438 +                                common/ppc/Makefile
 439 +                                common/sparc/Makefile
 440 +                                encoder/Makefile])
 441 +CFLAGS="$CFLAGS -D__X264__"
 442 +AC_OUTPUT
 443 diff -Nur x264-snapshot-20051022-2245.orig/encoder/Makefile.am x264-snapshot-20051022-2245/encoder/Makefile.am
 444 --- x264-snapshot-20051022-2245.orig/encoder/Makefile.am        1970-01-01 01:00:00.000000000 +0100
 445 +++ x264-snapshot-20051022-2245/encoder/Makefile.am     2005-10-24 00:30:20.749341296 +0200
 446 @@ -0,0 +1,8 @@
 447 +noinst_LTLIBRARIES = lib_encoder.la
 448 +
 449 +lib_encoder_la_SOURCES = \
 450 +       analyse.c me.c ratecontrol.c set.c macroblock.c cabac.c \
 451 +       cavlc.c encoder.c eval.c
 452 +
 453 +noinst_HEADERS = \
 454 +       analyse.h macroblock.h me.h ratecontrol.h set.h
 455 diff -Nur x264-snapshot-20051022-2245.orig/encoder/set.c x264-snapshot-20051022-2245/encoder/set.c
 456 --- x264-snapshot-20051022-2245.orig/encoder/set.c      2005-10-22 22:45:02.000000000 +0200
 457 +++ x264-snapshot-20051022-2245/encoder/set.c   2005-10-24 00:31:10.081841616 +0200
 458 @@ -21,6 +21,10 @@
 459   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
 460   *****************************************************************************/
 461
 462 +#ifdef HAVE_CONFIG_H
 463 +#include "config.h"
 464 +#endif
 465 +
 466  #ifdef HAVE_STDINT_H
 467  #include <stdint.h>
 468  #else
 469 diff -Nur x264-snapshot-20051022-2245.orig/Makefile.am x264-snapshot-20051022-2245/Makefile.am
 470 --- x264-snapshot-20051022-2245.orig/Makefile.am        1970-01-01 01:00:00.000000000 +0100
 471 +++ x264-snapshot-20051022-2245/Makefile.am     2005-10-24 01:33:43.529230880 +0200
 472 @@ -0,0 +1,14 @@
 473 +SUBDIRS = common encoder
 474 +
 475 +lib_LTLIBRARIES = libx264.la
 476 +bin_PROGRAMS = x264
 477 +
 478 +libx264_la_SOURCES =
 479 +
 480 +include_HEADERS = x264.h
 481 +noinst_HEADERS = matroska.h
 482 +
 483 +libx264_la_LIBADD = common/lib_common.la encoder/lib_encoder.la -lm
 484 +
 485 +x264_SOURCES = x264.c matroska.c
 486 +x264_LDADD = libx264.la
 487 diff -Nur x264-snapshot-20051022-2245.orig/strip_fPIC.sh x264-snapshot-20051022-2245/strip_fPIC.sh
 488 --- x264-snapshot-20051022-2245.orig/strip_fPIC.sh      1970-01-01 01:00:00.000000000 +0100
 489 +++ x264-snapshot-20051022-2245/strip_fPIC.sh   2005-10-23 22:43:57.648720088 +0200
 490 @@ -0,0 +1,17 @@
 491 +#!/bin/sh
 492 +#
 493 +# taken from flac sources  --qboosh
 494 +#
 495 +# libtool assumes that the compiler can handle the -fPIC flag
 496 +# This isn't always true (for example, nasm can't handle it)
 497 +command=""
 498 +while [ $1 ]; do
 499 +       if [ "$1" != "-fPIC" ]; then
 500 +               if [ "$1" != "-DPIC" ]; then
 501 +                       command="$command $1"
 502 +               fi
 503 +       fi
 504 +       shift
 505 +done
 506 +echo $command
 507 +exec $command
 508 diff -Nur x264-snapshot-20051022-2245.orig/x264.h x264-snapshot-20051022-2245/x264.h
 509 --- x264-snapshot-20051022-2245.orig/x264.h     2005-10-22 22:45:03.000000000 +0200
 510 +++ x264-snapshot-20051022-2245/x264.h  2005-10-24 00:34:12.415122744 +0200
 511 @@ -24,15 +24,7 @@
 512  #ifndef _X264_H
 513  #define _X264_H 1
 514
 515 -#if !defined(_STDINT_H) && !defined(_STDINT_H_) && \
 516 -    !defined(_INTTYPES_H) && !defined(_INTTYPES_H_)
 517 -# ifdef _MSC_VER
 518 -#  pragma message("You must include stdint.h or inttypes.h before x264.h")
 519 -# else
 520 -#  warning You must include stdint.h or inttypes.h before x264.h
 521 -# endif
 522 -#endif
 523 -
 524 +#include <stdint.h>
 525  #include <stdarg.h>
 526
 527  #define X264_BUILD 36