Changeset 608 in 3DVCSoftware for trunk/build/linux/lib

Timestamp:

1 Sep 2013, 22:47:26 (11 years ago)

Author:

tech

Message:

Merged DEV-2.0-dev0@604.

Location:

trunk/build/linux/lib

Files:

• TLibCommon/makefile (modified) (3 diffs)
• TLibDecoder/makefile (modified) (1 diff)
• TLibEncoder/makefile (modified) (2 diffs)

trunk/build/linux/lib/TLibCommon/makefile

@@ -35 +35 @@
                         $(OBJ_DIR)/ContextModel.o \
                         $(OBJ_DIR)/ContextModel3DBuffer.o \
+                        $(OBJ_DIR)/SEI.o \
                         $(OBJ_DIR)/TComCABACTables.o \
-                        $(OBJ_DIR)/TComAdaptiveLoopFilter.o \
                         $(OBJ_DIR)/TComSampleAdaptiveOffset.o \
                         $(OBJ_DIR)/TComBitStream.o \
                         $(OBJ_DIR)/TComDataCU.o \
-                        $(OBJ_DIR)/TComDepthMapGenerator.o \
                         $(OBJ_DIR)/TComLoopFilter.o \
                         $(OBJ_DIR)/TComMotionInfo.o \
@@ -50 +49 @@
                         $(OBJ_DIR)/TComPrediction.o \
                         $(OBJ_DIR)/TComRdCost.o \
-                        $(OBJ_DIR)/TComResidualGenerator.o \
                         $(OBJ_DIR)/TComRom.o \
                         $(OBJ_DIR)/TComSlice.o \
@@ -57 +55 @@
                         $(OBJ_DIR)/TComInterpolationFilter.o \
                         $(OBJ_DIR)/libmd5.o \
+                        $(OBJ_DIR)/TComWedgelet.o \
                         $(OBJ_DIR)/TComWeightPrediction.o \
                         $(OBJ_DIR)/TComRdCostWeightPrediction.o \
-                        $(OBJ_DIR)/TComWedgelet.o \
 
 LIBS                            = -lpthread

trunk/build/linux/lib/TLibDecoder/makefile

@@ -36 +36 @@
                                 $(OBJ_DIR)/NALread.o \
                                 $(OBJ_DIR)/SEIread.o \
+                                $(OBJ_DIR)/SyntaxElementParser.o \
                                 $(OBJ_DIR)/TDecBinCoderCABAC.o \
                                 $(OBJ_DIR)/TDecCAVLC.o \

trunk/build/linux/lib/TLibEncoder/makefile

@@ -35 +35 @@
                         $(OBJ_DIR)/NALwrite.o \
                         $(OBJ_DIR)/SEIwrite.o \
+                        $(OBJ_DIR)/SyntaxElementWriter.o \
                         $(OBJ_DIR)/TEncBinCoderCABAC.o \
                         $(OBJ_DIR)/TEncBinCoderCABACCounter.o \
-                        $(OBJ_DIR)/TEncAdaptiveLoopFilter.o \
                         $(OBJ_DIR)/TEncSampleAdaptiveOffset.o \
+                        $(OBJ_DIR)/TEncAnalyze.o \
                         $(OBJ_DIR)/TEncCavlc.o \
                         $(OBJ_DIR)/TEncCu.o \
@@ -50 +51 @@
                         $(OBJ_DIR)/TEncPreanalyzer.o \
                         $(OBJ_DIR)/WeightPredAnalysis.o \
+                        $(OBJ_DIR)/TEncRateCtrl.o \
 
 LIBS                            = -lpthread