rename 'core/' to 'common/', which avoids conflicts with libtool

git-svn-id: svn://svn.videolan.org/x264/trunk@67 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/Jamfile b/Jamfile
index df0ce44db08ce7e8f7e74e66c559ac90cbf55c2a..b7771bce2c7ce9bb2bf8e30453b981852b692dcf 100644 (file)
--- a/Jamfile
+++ b/Jamfile
@@ -17,19 +17,19 @@ DEFINES = DEBUG __X264__ ARCH_$(OSPLAT) SYS_$(OS) ;
 OPTIM = -O3 -funroll-loops ;
 
 # Headers rep
-HDRS = . core core/i386 decoder encoder ;
+HDRS = . common common/i386 decoder encoder ;
 
-SOURCES_C = core/mc.c core/predict.c core/pixel.c core/macroblock.c
-            core/frame.c core/dct.c core/cpu.c core/cabac.c
-            core/common.c core/mdate.c core/csp.c
+SOURCES_C = common/mc.c common/predict.c common/pixel.c common/macroblock.c
+            common/frame.c common/dct.c common/cpu.c common/cabac.c
+            common/common.c common/mdate.c common/csp.c
             encoder/analyse.c encoder/me.c encoder/ratecontrol.c
             encoder/set.c encoder/macroblock.c encoder/cabac.c encoder/cavlc.c
             encoder/encoder.c encoder/eval.c ;
 
-SOURCES_X86 = core/i386/cpu.asm ;
-SOURCES_MMX = core/i386/mc-c.c core/i386/dct-c.c core/i386/predict.c core/i386/dct.asm core/i386/pixel.asm core/i386/mc.asm ;
+SOURCES_X86 = common/i386/cpu.asm ;
+SOURCES_MMX = common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c common/i386/dct.asm common/i386/pixel.asm common/i386/mc.asm ;
 
-SOURCES_ALTIVEC = core/ppc/mc.c core/ppc/pixel.c ;
+SOURCES_ALTIVEC = common/ppc/mc.c common/ppc/pixel.c ;
 
 # libx264
 SOURCES_X264 = $(SOURCES_C) ;

diff --git a/Makefile b/Makefile
index be33f5888dff0b723195c2b1d3c29f33f80c5876..87f6d4cc10a8191b42c79d28f373eb5a7fc3b8c4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,20 +5,20 @@
 # Uncomment this for Mac OS X
 #SYS_MACOSX=1
 
-SRCS_COMMON= core/mc.c core/predict.c core/pixel.c core/macroblock.c \
-             core/frame.c core/dct.c core/cpu.c core/cabac.c \
-             core/common.c core/mdate.c core/csp.c \
+SRCS_COMMON= common/mc.c common/predict.c common/pixel.c common/macroblock.c \
+             common/frame.c common/dct.c common/cpu.c common/cabac.c \
+             common/common.c common/mdate.c common/csp.c \
              encoder/analyse.c encoder/me.c encoder/ratecontrol.c \
              encoder/set.c encoder/macroblock.c encoder/cabac.c \
              encoder/cavlc.c encoder/encoder.c encoder/eval.c x264.c
 
 ifdef SYS_MACOSX
 PFLAGS=-DARCH_PPC -DSYS_MACOSX -faltivec
-SRCS= $(SRCS_COMMON) core/ppc/mc.c core/ppc/pixel.c
+SRCS= $(SRCS_COMMON) common/ppc/mc.c common/ppc/pixel.c
 else
 PFLAGS=-DARCH_X86 -DHAVE_MMXEXT -DHAVE_SSE2 -DHAVE_MALLOC_H
-SRCS= $(SRCS_COMMON) core/i386/mc-c.c core/i386/dct-c.c core/i386/predict.c
-ASMSRC= core/i386/dct.asm core/i386/cpu.asm core/i386/pixel.asm  core/i386/mc.asm
+SRCS= $(SRCS_COMMON) common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c
+ASMSRC= common/i386/dct.asm common/i386/cpu.asm common/i386/pixel.asm common/i386/mc.asm
 OBJASM= $(ASMSRC:%.asm=%.o)
 endif
 

diff --git a/Makefile.cygwin b/Makefile.cygwin
index 7b698883aab905ba015ba4b3461e4cab1f0e6527..33b2872ab258b6bbc3e8177f856147bdc3b24b8f 100644 (file)
--- a/Makefile.cygwin
+++ b/Makefile.cygwin
@@ -4,20 +4,20 @@ PFLAGS=-DARCH_X86 -DHAVE_MMXEXT -DHAVE_SSE2
 CC=gcc
 CFLAGS=-g -Wall -I. -mno-cygwin -DDEBUG -O4 -funroll-loops -D__X264__ -UHAVE_MALLOC_H $(PFLAGS)
 
-SRCS=  core/mc.c core/predict.c core/pixel.c core/macroblock.c \
-       core/frame.c core/dct.c core/cpu.c core/cabac.c \
-       core/common.c core/mdate.c core/csp.c \
+SRCS=  common/mc.c common/predict.c common/pixel.c common/macroblock.c \
+       common/frame.c common/dct.c common/cpu.c common/cabac.c \
+       common/common.c common/mdate.c common/csp.c \
        encoder/analyse.c encoder/me.c encoder/ratecontrol.c \
        encoder/set.c encoder/macroblock.c encoder/cabac.c encoder/cavlc.c \
        encoder/encoder.c \
-       core/i386/mc-c.c core/i386/dct-c.c core/i386/predict.c \
+       common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c \
        x264.c
 
 AS= nasm
 #for cygwin
 ASFLAGS=-f win32 -DPREFIX $(PFLAGS)
           
-ASMSRC= core/i386/dct.asm core/i386/cpu.asm core/i386/pixel.asm core/i386/mc.asm
+ASMSRC= common/i386/dct.asm common/i386/cpu.asm common/i386/pixel.asm common/i386/mc.asm
 OBJASM= $(ASMSRC:%.asm=%.o)
 
 OBJS = $(SRCS:%.c=%.o)

diff --git a/build/cygwin/Makefile b/build/cygwin/Makefile
index f682b85f21293a8c16004897cd89f5ec6666d593..66460e1378c84bc0db1c3585c61328630ab3dbac 100644 (file)
--- a/build/cygwin/Makefile
+++ b/build/cygwin/Makefile
@@ -14,15 +14,15 @@ DIR_CUR=$(shell pwd)
 DIR_SRC=$(DIR_CUR)/../..
 
 # Sources
-SRC_C= core/mc.c core/predict.c core/pixel.c core/macroblock.c \
-       core/frame.c core/dct.c core/cpu.c core/cabac.c \
-       core/common.c core/mdate.c core/csp.c \
+SRC_C= common/mc.c common/predict.c common/pixel.c common/macroblock.c \
+       common/frame.c common/dct.c common/cpu.c common/cabac.c \
+       common/common.c common/mdate.c common/csp.c \
        encoder/analyse.c encoder/me.c encoder/ratecontrol.c \
        encoder/set.c encoder/macroblock.c encoder/cabac.c encoder/cavlc.c \
        encoder/encoder.c encoder/eval.c \
-       core/i386/mc-c.c core/i386/dct-c.c core/i386/predict.c
+       common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c
 
-SRC_ASM= core/i386/dct.asm core/i386/cpu.asm core/i386/pixel.asm core/i386/mc.asm
+SRC_ASM= common/i386/dct.asm common/i386/cpu.asm common/i386/pixel.asm common/i386/mc.asm
 
 # Alias
 RM= rm -rf

diff --git a/build/win32/libx264.dsp b/build/win32/libx264.dsp
index 4f517cda7df71e8db8d0987079fb4935f4f273ba..7fa723cc7eac38d61f2c8964bc1d07b831547f89 100644 (file)
--- a/build/win32/libx264.dsp
+++ b/build/win32/libx264.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "./core" /I "./encode" /I "./decode" /I "../../extras" /I "../.." /D "NDEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMXEXT" /D "ARCH_X86" /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "./common" /I "./encode" /I "./decode" /I "../../extras" /I "../.." /D "NDEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMXEXT" /D "ARCH_X86" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x804 /d "NDEBUG"
 # ADD RSC /l 0x804 /d "NDEBUG"
@@ -65,7 +65,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "./core" /I "./encode" /I "./decode" /I "../../extras" /I "../.." /D "_DEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMXEXT" /D "ARCH_X86" /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "./common" /I "./encode" /I "./decode" /I "../../extras" /I "../.." /D "_DEBUG" /D "_LIB" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMXEXT" /D "ARCH_X86" /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x804 /d "_DEBUG"
 # ADD RSC /l 0x804 /d "_DEBUG"
@@ -253,59 +253,59 @@ SOURCE=..\..\encoder\set.c
 # PROP Default_Filter ".h"
 # Begin Source File
 
-SOURCE=..\..\core\bs.h
+SOURCE=..\..\common\bs.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\cabac.h
+SOURCE=..\..\common\cabac.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\clip1.h
+SOURCE=..\..\common\clip1.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\common.h
+SOURCE=..\..\common\common.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\cpu.h
+SOURCE=..\..\common\cpu.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\csp.h
+SOURCE=..\..\common\csp.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\dct.h
+SOURCE=..\..\common\dct.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\frame.h
+SOURCE=..\..\common\frame.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\macroblock.h
+SOURCE=..\..\common\macroblock.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\mc.h
+SOURCE=..\..\common\mc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\pixel.h
+SOURCE=..\..\common\pixel.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\predict.h
+SOURCE=..\..\common\predict.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\set.h
+SOURCE=..\..\common\set.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\vlc.h
+SOURCE=..\..\common\vlc.h
 # End Source File
 # End Group
 # Begin Group "I386"
@@ -313,13 +313,13 @@ SOURCE=..\..\core\vlc.h
 # PROP Default_Filter "*.h,*.c,*.asm"
 # Begin Source File
 
-SOURCE=..\..\core\i386\cpu.asm
+SOURCE=..\..\common\i386\cpu.asm
 
 !IF  "$(CFG)" == "libx264 - Win32 Release"
 
 # Begin Custom Build - Assembly $(InputPath)
 IntDir=.\Release
-InputPath=..\..\core\i386\cpu.asm
+InputPath=..\..\common\i386\cpu.asm
 InputName=cpu
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -331,7 +331,7 @@ InputName=cpu
 
 # Begin Custom Build - Assembly $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\core\i386\cpu.asm
+InputPath=..\..\common\i386\cpu.asm
 InputName=cpu
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -344,17 +344,17 @@ InputName=cpu
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\core\i386\dct-c.c"
+SOURCE="..\..\common\i386\dct-c.c"
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\i386\dct.asm
+SOURCE=..\..\common\i386\dct.asm
 
 !IF  "$(CFG)" == "libx264 - Win32 Release"
 
 # Begin Custom Build - Assembly $(InputPath)
 IntDir=.\Release
-InputPath=..\..\core\i386\dct.asm
+InputPath=..\..\common\i386\dct.asm
 InputName=dct
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -366,7 +366,7 @@ InputName=dct
 
 # Begin Custom Build - Assembly $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\core\i386\dct.asm
+InputPath=..\..\common\i386\dct.asm
 InputName=dct
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -379,11 +379,11 @@ InputName=dct
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\i386\dct.h
+SOURCE=..\..\common\i386\dct.h
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\core\i386\mc-c.c"
+SOURCE="..\..\common\i386\mc-c.c"
 
 !IF  "$(CFG)" == "libx264 - Win32 Release"
 
@@ -396,13 +396,13 @@ SOURCE="..\..\core\i386\mc-c.c"
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\i386\mc.asm
+SOURCE=..\..\common\i386\mc.asm
 
 !IF  "$(CFG)" == "libx264 - Win32 Release"
 
 # Begin Custom Build - Assembly $(InputPath)
 IntDir=.\Release
-InputPath=..\..\core\i386\mc.asm
+InputPath=..\..\common\i386\mc.asm
 InputName=mc
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -414,7 +414,7 @@ InputName=mc
 
 # Begin Custom Build - Assembly $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\core\i386\mc.asm
+InputPath=..\..\common\i386\mc.asm
 InputName=mc
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -427,13 +427,13 @@ InputName=mc
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\i386\pixel.asm
+SOURCE=..\..\common\i386\pixel.asm
 
 !IF  "$(CFG)" == "libx264 - Win32 Release"
 
 # Begin Custom Build - Assembly $(InputPath)
 IntDir=.\Release
-InputPath=..\..\core\i386\pixel.asm
+InputPath=..\..\common\i386\pixel.asm
 InputName=pixel
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -445,7 +445,7 @@ InputName=pixel
 
 # Begin Custom Build - Assembly $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\core\i386\pixel.asm
+InputPath=..\..\common\i386\pixel.asm
 InputName=pixel
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -458,12 +458,12 @@ InputName=pixel
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\i386\pixel.h
+SOURCE=..\..\common\i386\pixel.h
 # End Source File
 # End Group
 # Begin Source File
 
-SOURCE=..\..\core\cabac.c
+SOURCE=..\..\common\cabac.c
 
 !IF  "$(CFG)" == "libx264 - Win32 Release"
 
@@ -478,7 +478,7 @@ SOURCE=..\..\core\cabac.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\common.c
+SOURCE=..\..\common\common.c
 
 !IF  "$(CFG)" == "libx264 - Win32 Release"
 
@@ -493,7 +493,7 @@ SOURCE=..\..\core\common.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\cpu.c
+SOURCE=..\..\common\cpu.c
 
 !IF  "$(CFG)" == "libx264 - Win32 Release"
 
@@ -508,11 +508,11 @@ SOURCE=..\..\core\cpu.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\csp.c
+SOURCE=..\..\common\csp.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\dct.c
+SOURCE=..\..\common\dct.c
 
 !IF  "$(CFG)" == "libx264 - Win32 Release"
 
@@ -527,7 +527,7 @@ SOURCE=..\..\core\dct.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\frame.c
+SOURCE=..\..\common\frame.c
 
 !IF  "$(CFG)" == "libx264 - Win32 Release"
 
@@ -542,7 +542,7 @@ SOURCE=..\..\core\frame.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\macroblock.c
+SOURCE=..\..\common\macroblock.c
 
 !IF  "$(CFG)" == "libx264 - Win32 Release"
 
@@ -557,7 +557,7 @@ SOURCE=..\..\core\macroblock.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\mc.c
+SOURCE=..\..\common\mc.c
 
 !IF  "$(CFG)" == "libx264 - Win32 Release"
 
@@ -572,7 +572,7 @@ SOURCE=..\..\core\mc.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\mdate.c
+SOURCE=..\..\common\mdate.c
 
 !IF  "$(CFG)" == "libx264 - Win32 Release"
 
@@ -587,7 +587,7 @@ SOURCE=..\..\core\mdate.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\pixel.c
+SOURCE=..\..\common\pixel.c
 
 !IF  "$(CFG)" == "libx264 - Win32 Release"
 
@@ -602,7 +602,7 @@ SOURCE=..\..\core\pixel.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\core\predict.c
+SOURCE=..\..\common\predict.c
 
 !IF  "$(CFG)" == "libx264 - Win32 Release"
 

diff --git a/build/win32/x264.dsp b/build/win32/x264.dsp
index 9fe8398f145a293178fbbf7c76ca13c2438605c0..4b7d59bd19fe4f360219a723cdc3310749275be0 100644 (file)
--- a/build/win32/x264.dsp
+++ b/build/win32/x264.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "./core" /I "./encode" /I "./decode" /I "../../extras" /I "../.." /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMXEXT" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "./common" /I "./encode" /I "./decode" /I "../../extras" /I "../.." /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMXEXT" /YX /FD /c
 # ADD BASE RSC /l 0x804 /d "NDEBUG"
 # ADD RSC /l 0x804 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../../core" /I "../../encode" /I "../../decode" /I "../../extras" /I "../.." /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMXEXT" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../../common" /I "../../encode" /I "../../decode" /I "../../extras" /I "../.." /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "__X264__" /D "HAVE_MMXEXT" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x804 /d "_DEBUG"
 # ADD RSC /l 0x804 /d "_DEBUG"
 BSC32=bscmake.exe

diff --git a/core/bs.h b/common/bs.h
similarity index 100%
rename from core/bs.h
rename to common/bs.h

diff --git a/core/cabac.c b/common/cabac.c
similarity index 100%
rename from core/cabac.c
rename to common/cabac.c

diff --git a/core/cabac.h b/common/cabac.h
similarity index 100%
rename from core/cabac.h
rename to common/cabac.h

diff --git a/core/clip1.h b/common/clip1.h
similarity index 100%
rename from core/clip1.h
rename to common/clip1.h

diff --git a/core/common.c b/common/common.c
similarity index 100%
rename from core/common.c
rename to common/common.c

diff --git a/core/common.h b/common/common.h
similarity index 100%
rename from core/common.h
rename to common/common.h

diff --git a/core/cpu.c b/common/cpu.c
similarity index 100%
rename from core/cpu.c
rename to common/cpu.c

diff --git a/core/cpu.h b/common/cpu.h
similarity index 100%
rename from core/cpu.h
rename to common/cpu.h

diff --git a/core/csp.c b/common/csp.c
similarity index 100%
rename from core/csp.c
rename to common/csp.c

diff --git a/core/csp.h b/common/csp.h
similarity index 100%
rename from core/csp.h
rename to common/csp.h

diff --git a/core/dct.c b/common/dct.c
similarity index 100%
rename from core/dct.c
rename to common/dct.c

diff --git a/core/dct.h b/common/dct.h
similarity index 100%
rename from core/dct.h
rename to common/dct.h

diff --git a/core/frame.c b/common/frame.c
similarity index 100%
rename from core/frame.c
rename to common/frame.c

diff --git a/core/frame.h b/common/frame.h
similarity index 100%
rename from core/frame.h
rename to common/frame.h

diff --git a/core/i386/cpu.asm b/common/i386/cpu.asm
similarity index 100%
rename from core/i386/cpu.asm
rename to common/i386/cpu.asm

diff --git a/core/i386/dct-c.c b/common/i386/dct-c.c
similarity index 100%
rename from core/i386/dct-c.c
rename to common/i386/dct-c.c

diff --git a/core/i386/dct.asm b/common/i386/dct.asm
similarity index 100%
rename from core/i386/dct.asm
rename to common/i386/dct.asm

diff --git a/core/i386/dct.h b/common/i386/dct.h
similarity index 100%
rename from core/i386/dct.h
rename to common/i386/dct.h

diff --git a/core/i386/mc-c.c b/common/i386/mc-c.c
similarity index 100%
rename from core/i386/mc-c.c
rename to common/i386/mc-c.c

diff --git a/core/i386/mc.asm b/common/i386/mc.asm
similarity index 100%
rename from core/i386/mc.asm
rename to common/i386/mc.asm

diff --git a/core/i386/mc.h b/common/i386/mc.h
similarity index 100%
rename from core/i386/mc.h
rename to common/i386/mc.h

diff --git a/core/i386/pixel.asm b/common/i386/pixel.asm
similarity index 100%
rename from core/i386/pixel.asm
rename to common/i386/pixel.asm

diff --git a/core/i386/pixel.h b/common/i386/pixel.h
similarity index 100%
rename from core/i386/pixel.h
rename to common/i386/pixel.h

diff --git a/core/i386/predict.c b/common/i386/predict.c
similarity index 100%
rename from core/i386/predict.c
rename to common/i386/predict.c

diff --git a/core/i386/predict.h b/common/i386/predict.h
similarity index 100%
rename from core/i386/predict.h
rename to common/i386/predict.h

diff --git a/core/macroblock.c b/common/macroblock.c
similarity index 100%
rename from core/macroblock.c
rename to common/macroblock.c

diff --git a/core/macroblock.h b/common/macroblock.h
similarity index 100%
rename from core/macroblock.h
rename to common/macroblock.h

diff --git a/core/mc.c b/common/mc.c
similarity index 100%
rename from core/mc.c
rename to common/mc.c

diff --git a/core/mc.h b/common/mc.h
similarity index 100%
rename from core/mc.h
rename to common/mc.h

diff --git a/core/mdate.c b/common/mdate.c
similarity index 100%
rename from core/mdate.c
rename to common/mdate.c

diff --git a/core/pixel.c b/common/pixel.c
similarity index 100%
rename from core/pixel.c
rename to common/pixel.c

diff --git a/core/pixel.h b/common/pixel.h
similarity index 100%
rename from core/pixel.h
rename to common/pixel.h

diff --git a/core/ppc/mc.c b/common/ppc/mc.c
similarity index 100%
rename from core/ppc/mc.c
rename to common/ppc/mc.c

diff --git a/core/ppc/mc.h b/common/ppc/mc.h
similarity index 100%
rename from core/ppc/mc.h
rename to common/ppc/mc.h

diff --git a/core/ppc/pixel.c b/common/ppc/pixel.c
similarity index 100%
rename from core/ppc/pixel.c
rename to common/ppc/pixel.c

diff --git a/core/ppc/pixel.h b/common/ppc/pixel.h
similarity index 100%
rename from core/ppc/pixel.h
rename to common/ppc/pixel.h

diff --git a/core/ppc/ppccommon.h b/common/ppc/ppccommon.h
similarity index 100%
rename from core/ppc/ppccommon.h
rename to common/ppc/ppccommon.h

diff --git a/core/predict.c b/common/predict.c
similarity index 100%
rename from core/predict.c
rename to common/predict.c

diff --git a/core/predict.h b/common/predict.h
similarity index 100%
rename from core/predict.h
rename to common/predict.h

diff --git a/core/set.h b/common/set.h
similarity index 100%
rename from core/set.h
rename to common/set.h

diff --git a/core/vlc.h b/common/vlc.h
similarity index 100%
rename from core/vlc.h
rename to common/vlc.h

diff --git a/decoder/decoder.c b/decoder/decoder.c
index 17c703274edc4783d590fe67368be98baf829796..fa47454d0becbc3370ffd9421395fc6cf23011be 100644 (file)
--- a/decoder/decoder.c
+++ b/decoder/decoder.c
@@ -26,9 +26,9 @@
 #include <string.h>
 #include <stdint.h>
 
-#include "../core/common.h"
-#include "../core/cpu.h"
-#include "../core/vlc.h"
+#include "../common/common.h"
+#include "../common/cpu.h"
+#include "../common/vlc.h"
 
 #include "macroblock.h"
 #include "set.h"

diff --git a/decoder/macroblock.c b/decoder/macroblock.c
index 0d580e457d395640491e4f5e2766b8f6d9d1efdf..55e8ea4bc8efd23fc67b6967ec94d74ee9daf93c 100644 (file)
--- a/decoder/macroblock.c
+++ b/decoder/macroblock.c
@@ -26,8 +26,8 @@
 #include <string.h>
 #include <stdint.h>
 
-#include "../core/common.h"
-#include "../core/vlc.h"
+#include "../common/common.h"
+#include "../common/vlc.h"
 #include "vlc.h"
 #include "macroblock.h"
 

diff --git a/decoder/set.c b/decoder/set.c
index fb489970bebb947c1cce69ed184e0133bb0f3716..e3f10aff3b205d113574d8f1a504fc1f9637b34f 100644 (file)
--- a/decoder/set.c
+++ b/decoder/set.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <stdint.h>
 
-#include "../core/common.h"
+#include "../common/common.h"
 #include "set.h"
 
 /* return -1 if invalid, else the id */

diff --git a/decoder/vlc.c b/decoder/vlc.c
index 2109e8c63e501403da3ecfff784e4da1a6915921..dc7f8d7e63d01a2c76fe5b9c8493d9f99352fd83 100644 (file)
--- a/decoder/vlc.c
+++ b/decoder/vlc.c
@@ -25,8 +25,8 @@
 #include <stdio.h>
 #include <inttypes.h>
 
-#include "../core/common.h"
-#include "../core/vlc.h"
+#include "../common/common.h"
+#include "../common/vlc.h"
 #include "vlc.h"
 
 

diff --git a/encoder/analyse.c b/encoder/analyse.c
index da79c64eb882a467cbac29219b18c1fd9f0fe649..7893513c660f4a4b9ae27c7048c3605807c150c4 100644 (file)
--- a/encoder/analyse.c
+++ b/encoder/analyse.c
@@ -27,8 +27,8 @@
 #include <math.h>
 #include <limits.h>
 
-#include "../core/common.h"
-#include "../core/macroblock.h"
+#include "../common/common.h"
+#include "../common/macroblock.h"
 #include "macroblock.h"
 #include "me.h"
 #include "ratecontrol.h"

diff --git a/encoder/cabac.c b/encoder/cabac.c
index ce218247db9c828d8fb241894c7c8ae755113472..0dc3228c08eb1794b0b28de7561cc7d9453e0da2 100644 (file)
--- a/encoder/cabac.c
+++ b/encoder/cabac.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../core/common.h"
+#include "../common/common.h"
 #include "macroblock.h"
 
 static const uint8_t block_idx_x[16] =

diff --git a/encoder/cavlc.c b/encoder/cavlc.c
index d2488c4cce107d5614d0ddb73c8c50ebfc456698..5f19be00946700a7880e36c6937780527ab208d2 100644 (file)
--- a/encoder/cavlc.c
+++ b/encoder/cavlc.c
@@ -25,8 +25,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../core/common.h"
-#include "../core/vlc.h"
+#include "../common/common.h"
+#include "../common/vlc.h"
 #include "macroblock.h"
 
 static const uint8_t intra4x4_cbp_to_golomb[48]=

diff --git a/encoder/encoder.c b/encoder/encoder.c
index 214237c05800c302e030b808729c7d05b4eaee5f..891ef73a9a843a7bb019cf56e082d25b024becc3 100644 (file)
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -27,8 +27,8 @@
 
 #include <math.h>
 
-#include "../core/common.h"
-#include "../core/cpu.h"
+#include "../common/common.h"
+#include "../common/cpu.h"
 
 #include "set.h"
 #include "analyse.h"

diff --git a/encoder/macroblock.c b/encoder/macroblock.c
index 21a097e9f4da8d0443f40b4fa345e4bece6c9016..973340681a4ff40218e08737af57287fca4fbd75 100644 (file)
--- a/encoder/macroblock.c
+++ b/encoder/macroblock.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../core/common.h"
+#include "../common/common.h"
 #include "macroblock.h"
 
 

diff --git a/encoder/macroblock.h b/encoder/macroblock.h
index b030755cdef3904e57e8cc141233612ae3d4421e..0b297cc92128d88949ae437064a7565172246d98 100644 (file)
--- a/encoder/macroblock.h
+++ b/encoder/macroblock.h
@@ -24,7 +24,7 @@
 #ifndef _ENCODER_MACROBLOCK_H
 #define _ENCODER_MACROBLOCK_H 1
 
-#include "../core/macroblock.h"
+#include "../common/macroblock.h"
 
 int x264_macroblock_probe_pskip( x264_t *h );
 

diff --git a/encoder/me.c b/encoder/me.c
index e105031cc8dd2492ea45d8a6f2b0dc3ad3c803ca..75d0869977239779e0d5b9738eb1607c2b5560a0 100644 (file)
--- a/encoder/me.c
+++ b/encoder/me.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../core/common.h"
+#include "../common/common.h"
 #include "me.h"
 
 /* presets selected from good points on the speed-vs-quality curve of several test videos

diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c
index 36030c0730d0d60be7d463dffe470ef6a17510b0..bb944ddbbdfe3fbd348ac70850acf67beca068c8 100644 (file)
--- a/encoder/ratecontrol.c
+++ b/encoder/ratecontrol.c
@@ -32,9 +32,9 @@
 #include <limits.h>
 #include <assert.h>
 
-#include "../core/common.h"
-#include "../core/cpu.h"
-#include "../core/macroblock.h"
+#include "../common/common.h"
+#include "../common/cpu.h"
+#include "../common/macroblock.h"
 #include "ratecontrol.h"
 
 #ifdef SYS_MACOSX

diff --git a/encoder/set.c b/encoder/set.c
index e0c9504b2b2e6518dd9cda37ca7f43ac422b29db..2f43f4ceb83c0eb71cb4df01a46667416b23ba34 100644 (file)
--- a/encoder/set.c
+++ b/encoder/set.c
@@ -32,8 +32,8 @@
 #include <stdarg.h>
 
 #include "../x264.h"
-#include "../core/bs.h"
-#include "../core/set.h"
+#include "../common/bs.h"
+#include "../common/set.h"
 
 void x264_sps_init( x264_sps_t *sps, int i_id, x264_param_t *param )
 {

diff --git a/testing/checkasm.c b/testing/checkasm.c
index 1c5ab7e0aa5fc74d173b97cc940b454c79a43027..0d83c8e6603384a6f033e863445c92f018b9153e 100644 (file)
--- a/testing/checkasm.c
+++ b/testing/checkasm.c
@@ -3,14 +3,14 @@
 #include <string.h>
 
 #
-#include "core/common.h"
+#include "common/common.h"
 #ifdef HAVE_MMXEXT
-#include "core/i386/pixel.h"
-#include "core/i386/dct.h"
-#include "core/i386/mc.h"
+#include "common/i386/pixel.h"
+#include "common/i386/dct.h"
+#include "common/i386/mc.h"
 #endif
 #ifdef ARCH_PPC
-#include "core/ppc/pixel.h"
+#include "common/ppc/pixel.h"
 #endif
 
 /* buf1, buf2: initialised to randome data and shouldn't write into them */

diff --git a/testing/macroblock-dz.c b/testing/macroblock-dz.c
index 719edcbbc96e3f890dc230b85dfd7b7afefef3d3..a81f9440bf82e3d3e36b8b9b42606f49b024ee5f 100644 (file)
--- a/testing/macroblock-dz.c
+++ b/testing/macroblock-dz.c
@@ -26,8 +26,8 @@
 #include <string.h>
 #include <stdint.h>
 
-#include "../core/common.h"
-#include "../core/vlc.h"
+#include "../common/common.h"
+#include "../common/vlc.h"
 #include "macroblock.h"
 
 static const uint8_t intra4x4_cbp_to_golomb[48]=

diff --git a/tools/avc2avi.c b/tools/avc2avi.c
index 07f142bb4ce5af123f2bf36a3eb1e9db3202e9e9..36f11c446f4d648e10aa094c41eaf434e40d3a0e 100644 (file)
--- a/tools/avc2avi.c
+++ b/tools/avc2avi.c
@@ -35,7 +35,7 @@
 #include <fcntl.h>  /* _O_BINARY */
 #endif
 
-#include "../core/bs.h"
+#include "../common/bs.h"
 
 #define DATA_MAX 3000000
 uint8_t data[DATA_MAX];

diff --git a/x264.c b/x264.c
index 9ced41beb7dfb53ec28e9f77466635e943926803..3c1185e3fcccf58d0eb5dd5ebca028ab70f58e89 100644 (file)
--- a/x264.c
+++ b/x264.c
@@ -36,7 +36,7 @@
 #include <fcntl.h>  /* _O_BINARY */
 #endif
 
-#include "core/common.h"
+#include "common/common.h"
 #include "x264.h"
 
 #define DATA_MAX 3000000