1 Index: common/i386/mc-a.asm
2 ===================================================================
3 --- common/i386/mc-a.asm (revision 346)
4 +++ common/i386/mc-a.asm (working copy)
8 ;=============================================================================
10 -;=============================================================================
15 -SECTION .rodata data align=16
24 -;=============================================================================
26 ;=============================================================================
33 +;=============================================================================
35 +;=============================================================================
40 +SECTION .rodata data align=16
49 Index: common/i386/deblock-a.asm
50 ===================================================================
51 --- common/i386/deblock-a.asm (revision 346)
52 +++ common/i386/deblock-a.asm (working copy)
57 -SECTION .rodata align=16
58 -pb_01: times 16 db 0x01
59 -pb_3f: times 16 db 0x3f
60 -pb_ff: times 16 db 0xff
63 cglobal x264_deblock_v8_luma_mmxext
64 cglobal x264_deblock_h_luma_mmxext
69 +;=============================================================================
70 +; Local Data (Read Only)
71 +;=============================================================================
72 +SECTION .rodata align=16
73 +pb_01: times 16 db 0x01
74 +pb_3f: times 16 db 0x3f
75 +pb_ff: times 16 db 0xff
77 Index: common/i386/dct-a.asm
78 ===================================================================
79 --- common/i386/dct-a.asm (revision 346)
80 +++ common/i386/dct-a.asm (working copy)
84 ;=============================================================================
85 -; Local Data (Read Only)
86 -;=============================================================================
91 -SECTION .rodata data align=16
94 -;-----------------------------------------------------------------------------
95 -; Various memory constants (trigonometric values or rounding values)
96 -;-----------------------------------------------------------------------------
99 -x264_mmx_1: dw 1, 1, 1, 1
100 -x264_mmx_32: dw 32, 32, 32, 32
101 -x264_mmx_PPNN: dw 1, 1, -1, -1
102 -x264_mmx_PNPN: dw 1, -1, 1, -1
103 -x264_mmx_PNNP: dw 1, -1, -1, 1
104 -x264_mmx_PPPN: dw 1, 1, 1, -1
105 -x264_mmx_PPNP: dw 1, 1, -1, 1
106 -x264_mmx_2121: dw 2, 1, 2, 1
107 -x264_mmx_p2n2p1p1: dw 2, -2, 1, 1
109 -;=============================================================================
111 ;=============================================================================
117 +;=============================================================================
118 +; Local Data (Read Only)
119 +;=============================================================================
122 +SECTION .rodata data
124 +SECTION .rodata data align=16
127 +;-----------------------------------------------------------------------------
128 +; Various memory constants (trigonometric values or rounding values)
129 +;-----------------------------------------------------------------------------
132 +x264_mmx_1: dw 1, 1, 1, 1
133 +x264_mmx_32: dw 32, 32, 32, 32
134 +x264_mmx_PPNN: dw 1, 1, -1, -1
135 +x264_mmx_PNPN: dw 1, -1, 1, -1
136 +x264_mmx_PNNP: dw 1, -1, -1, 1
137 +x264_mmx_PPPN: dw 1, 1, 1, -1
138 +x264_mmx_PPNP: dw 1, 1, -1, 1
139 +x264_mmx_2121: dw 2, 1, 2, 1
140 +x264_mmx_p2n2p1p1: dw 2, -2, 1, 1
142 Index: common/i386/pixel-sse2.asm
143 ===================================================================
144 --- common/i386/pixel-sse2.asm (revision 346)
145 +++ common/i386/pixel-sse2.asm (working copy)
151 -SECTION .rodata data
153 -SECTION .rodata data align=16
156 -pd_0000ffff: times 4 dd 0x0000ffff
166 +;=============================================================================
167 +; Local Data (Read Only)
168 +;=============================================================================
170 +SECTION .rodata data
172 +SECTION .rodata data align=16
175 +pd_0000ffff: times 4 dd 0x0000ffff
178 Index: common/i386/mc-a2.asm
179 ===================================================================
180 --- common/i386/mc-a2.asm (revision 346)
181 +++ common/i386/mc-a2.asm (working copy)
186 -;=============================================================================
188 -;=============================================================================
190 -SECTION .rodata data align=16
210 +;=============================================================================
212 +;=============================================================================
214 +SECTION .rodata data align=16
226 --- configure 2005-11-28 15:42:12.390625000 +0000
227 +++ configure.new 2005-11-28 15:52:48.687500000 +0000
229 echo "available options:"
231 echo " --help print this message"
232 +echo " --crosscompile=ARCH crosscompile for ARCH"
233 echo " --enable-avis-input enables avisynth input (win32 only)"
234 echo " --enable-mp4-output enables mp4 output (using gpac)"
235 echo " --enable-vfw compiles the VfW frontend"
245 +UNAMES="`uname -s |tr A-Z a-z`"
246 +UNAMEM="`uname -m |tr A-Z a-z`"
257 + RANLIB="$CROSS-ranlib"
258 + UNAMES="`echo $CROSS | cut -d- -f2`"
259 + UNAMEM="`echo $CROSS | cut -d- -f1`"
265 + exec_prefix="$optarg"
274 + includedir="$optarg"
276 + --enable-avis-input)
277 + if [ $SYS = CYGWIN -o $SYS = MINGW ]; then
278 + CFLAGS="$CFLAGS -DAVIS_INPUT"
279 + LDFLAGS="$LDFLAGS -lvfw32"
283 + --enable-mp4-output)
284 + CFLAGS="$CFLAGS -DMP4_OUTPUT"
285 + LDFLAGS="$LDFLAGS -lgpac_static"
286 + if [ $SYS = CYGWIN -o $SYS = MINGW ]; then
287 + LDFLAGS="$LDFLAGS -lwinmm"
292 + ASFLAGS="$ASFLAGS ${opt#--extra-asflags=}"
295 + CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
296 + VFW_CFLAGS="${opt#--extra-cflags=}"
299 + LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
300 + VFW_LDFLAGS="${opt#--extra-ldflags=}"
303 + CFLAGS="$CFLAGS -DHAVE_PTHREAD=1"
309 + LDFLAGS="$LDFLAGS -lpthread"
314 + CFLAGS="$CFLAGS -g"
318 + CFLAGS="$CFLAGS -pg"
319 + LDFLAGS="$LDFLAGS -pg"
325 + --enable-visualize)
326 + LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
327 + CFLAGS="$CFLAGS -DVISUALIZE=1"
331 + echo "Unknown option $opt, ignored"
341 CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
346 CFLAGS="$CFLAGS -falign-loops=16"
347 LDFLAGS="$LDFLAGS -lm -lmx"
352 LDFLAGS="$LDFLAGS -lm"
357 LDFLAGS="$LDFLAGS -lm"
362 CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
363 LDFLAGS="$LDFLAGS -lm"
368 CFLAGS="$CFLAGS -mno-cygwin"
369 LDFLAGS="$LDFLAGS -mno-cygwin"
377 ASFLAGS="-f win32 -DPREFIX"
384 CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
385 LDFLAGS="$LDFLAGS -lm"
392 - i386|i486|i586|i686|BePC)
393 + i386|i486|i586|i686|bepc)
395 CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2"
399 ASFLAGS="-f elf -m amd64"
401 - "Power Macintosh"|ppc)
402 + "power macintosh"|ppc)
408 CFLAGS="$CFLAGS -DARCH_$ARCH -DSYS_$SYS"
419 - exec_prefix="$optarg"
428 - includedir="$optarg"
430 - --enable-avis-input)
431 - if [ $SYS = CYGWIN -o $SYS = MINGW ]; then
432 - CFLAGS="$CFLAGS -DAVIS_INPUT"
433 - LDFLAGS="$LDFLAGS -lvfw32"
437 - --enable-mp4-output)
438 - CFLAGS="$CFLAGS -DMP4_OUTPUT"
439 - LDFLAGS="$LDFLAGS -lgpac_static"
440 - if [ $SYS = CYGWIN -o $SYS = MINGW ]; then
441 - LDFLAGS="$LDFLAGS -lwinmm"
446 - ASFLAGS="$ASFLAGS ${opt#--extra-asflags=}"
449 - CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
450 - VFW_CFLAGS="${opt#--extra-cflags=}"
453 - LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
454 - VFW_LDFLAGS="${opt#--extra-ldflags=}"
457 - CFLAGS="$CFLAGS -DHAVE_PTHREAD=1"
463 - LDFLAGS="$LDFLAGS -lpthread"
468 - CFLAGS="$CFLAGS -g"
472 - CFLAGS="$CFLAGS -pg"
473 - LDFLAGS="$LDFLAGS -pg"
479 - --enable-visualize)
480 - LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
481 - CFLAGS="$CFLAGS -DVISUALIZE=1"
485 - echo "Unknown option $opt, ignored"
491 if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
492 CFLAGS="$CFLAGS -s -fomit-frame-pointer"
501 HAVE_GETOPT_LONG=$HAVE_GETOPT_LONG
503 --- Makefile.old 2005-11-23 17:25:15.953125000 +0000
504 +++ Makefile 2005-11-23 17:38:09.796875000 +0000
506 default: $(DEP) x264$(EXE)
508 libx264.a: .depend $(OBJS) $(OBJASM)
509 - ar rc libx264.a $(OBJS) $(OBJASM)
511 + $(AR) rc libx264.a $(OBJS) $(OBJASM)
512 + $(RANLIB) libx264.a
514 x264$(EXE): libx264.a x264.o matroska.o
515 $(CC) -o $@ x264.o matroska.o libx264.a $(LDFLAGS)
517 install -m 644 x264.h $(DESTDIR)$(includedir)
518 install -m 644 libx264.a $(DESTDIR)$(libdir)
519 install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
520 - install x264 $(DESTDIR)$(bindir)
521 - ranlib $(DESTDIR)$(libdir)/libx264.a
522 + install x264$(EXE) $(DESTDIR)$(bindir)
523 + $(RANLIB) $(DESTDIR)$(libdir)/libx264.a