tweak makefile

1 files changed, 14 insertions, 14 deletions

diff --git a/ffmpeg/config.mak b/ffmpeg/config.mak
index 24ec1b6..b6be080 100644
--- a/ffmpeg/config.mak
+++ b/ffmpeg/config.mak
@@ -13,7 +13,7 @@ SRC_PATH=.
 ifndef MAIN_MAKEFILE
 SRC_PATH:=$(SRC_PATH:.%=..%)
 endif
-CC_IDENT=gcc 4.7 (Ubuntu/Linaro 4.7.3-1ubuntu1)
+CC_IDENT=gcc 4.7 (Ubuntu/Linaro 4.7.2-2ubuntu1)
 ARCH=x86
 CC=gcc
 CXX=g++
@@ -32,10 +32,10 @@ RANLIB=ranlib
 CP=cp -p
 LN_S=ln -s -f
 STRIP=strip
-CPPFLAGS= -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 -DPIC
-CFLAGS=   -std=c99 -fomit-frame-pointer -fPIC -pthread -I/usr/include/schroedinger-1.0 -I/usr/include/orc-0.4 -g -Wdeclaration-after-statement -Wall -Wno-parentheses -Wno-switch -Wno-format-zero-length -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wno-pointer-sign -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast -Wstrict-prototypes -O3 -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=implicit-function-declaration -Werror=missing-prototypes -Werror=return-type -Werror=vla
+CPPFLAGS= -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600
+CFLAGS=   -std=c99 -fomit-frame-pointer -pthread -I/usr/include/schroedinger-1.0 -I/usr/include/orc-0.4 -g -Wdeclaration-after-statement -Wall -Wno-parentheses -Wno-switch -Wno-format-zero-length -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wno-pointer-sign -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wno-pointer-to-int-cast -Wstrict-prototypes -O3 -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -Werror=implicit-function-declaration -Werror=missing-prototypes -Werror=return-type -Werror=vla
 CXXFLAGS=  -D__STDC_CONSTANT_MACROS
-ASFLAGS=   -fPIC -g
+ASFLAGS=   -g
 AS_C=-c
 AS_O=-o $@
 CC_C=-c
@@ -50,7 +50,7 @@ DLLTOOL=
 LDFLAGS=  -Wl,--as-needed -Wl,--warn-common -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample
 LDFLAGS-ffserver=-Wl,-E
 SHFLAGS=-shared -Wl,-soname,$$(@F) -Wl,-Bsymbolic -Wl,--version-script,$(SUBDIR)lib$(NAME).ver
-YASMFLAGS=-f elf -m amd64 -DPIC -g dwarf2
+YASMFLAGS=-f elf  -g dwarf2
 BUILDSUF=
 PROGSSUF=
 FULLNAME=$(NAME)$(BUILDSUF)
@@ -89,7 +89,7 @@ LIBS-ffplay=
 CFLAGS-ffplay=
 ZLIB=-lz
 LIB_INSTALL_EXTRA_CMD=$$(RANLIB) "$(LIBDIR)/$(LIBNAME)"
-EXTRALIBS=-ldl -lXfixes -lXext -lX11 -ljack -lasound -lxvidcore -lx264 -lvorbisenc -lvorbis -logg -ltheoraenc -ltheoradec -logg -lschroedinger-1.0 -lmp3lame -lfaac -lm -pthread -lz 
+EXTRALIBS=-ldl -lXfixes -lXext -lX11 -ljack -lasound -lxvidcore -lx264 -lvorbisenc -lvorbis -logg -ltheoraenc -ltheoradec -logg -lschroedinger-1.0 -lmp3lame -lfaac -lm -pthread -lz -lrt 
 COMPAT_OBJS=
 EXEOBJS=
 INSTALL=install
@@ -154,8 +154,8 @@ libswscale_VERSION_MINOR=2
 !ARCH_TILEPRO=yes
 !ARCH_TOMI=yes
 ARCH_X86=yes
-!ARCH_X86_32=yes
-ARCH_X86_64=yes
+ARCH_X86_32=yes
+!ARCH_X86_64=yes
 !HAVE_ARMV5TE=yes
 !HAVE_ARMV6=yes
 !HAVE_ARMV6T2=yes
@@ -280,7 +280,7 @@ HAVE_ATTRIBUTE_PACKED=yes
 !HAVE_CDIO_PARANOIA_PARANOIA_H=yes
 HAVE_CLOCK_GETTIME=yes
 !HAVE_CLOSESOCKET=yes
-HAVE_CMOV=yes
+!HAVE_CMOV=yes
 !HAVE_COMMANDLINETOARGVW=yes
 HAVE_CPUNOP=yes
 !HAVE_CRYPTGENRANDOM=yes
@@ -297,9 +297,9 @@ HAVE_DLOPEN=yes
 !HAVE_DXVA_H=yes
 HAVE_EBP_AVAILABLE=yes
 HAVE_EBX_AVAILABLE=yes
-HAVE_FAST_64BIT=yes
+!HAVE_FAST_64BIT=yes
 HAVE_FAST_CLZ=yes
-HAVE_FAST_CMOV=yes
+!HAVE_FAST_CMOV=yes
 HAVE_FCNTL=yes
 HAVE_FORK=yes
 HAVE_GETADDRINFO=yes
@@ -338,7 +338,7 @@ HAVE_MALLOC_H=yes
 HAVE_MEMALIGN=yes
 !HAVE_MEMORYBARRIER=yes
 HAVE_MKSTEMP=yes
-HAVE_MM_EMPTY=yes
+!HAVE_MM_EMPTY=yes
 HAVE_MMAP=yes
 HAVE_MPROTECT=yes
 !HAVE_MSVCRT=yes
@@ -395,7 +395,7 @@ HAVE_USLEEP=yes
 !HAVE_WINDOWS_H=yes
 !HAVE_WINSOCK2_H=yes
 !HAVE_XFORM_ASM=yes
-HAVE_XMM_CLOBBERS=yes
+!HAVE_XMM_CLOBBERS=yes
 CONFIG_BSFS=yes
 CONFIG_DECODERS=yes
 CONFIG_DEMUXERS=yes
@@ -495,7 +495,7 @@ CONFIG_MDCT=yes
 !CONFIG_MEMORY_POISONING=yes
 CONFIG_NETWORK=yes
 CONFIG_NONFREE=yes
-CONFIG_PIC=yes
+!CONFIG_PIC=yes
 CONFIG_RDFT=yes
 CONFIG_RUNTIME_CPUDETECT=yes
 CONFIG_SAFE_BITSTREAM_READER=yes