build/generic/Makefile       |   22 ++++++++++++++++++++++

 src/motion/estimation_bvop.c |    2 +-

 src/motion/estimation_pvop.c |   12 ++++++------

 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/build/generic/Makefile b/build/generic/Makefile

index 83006e2..e473c3d 100644

--- a/build/generic/Makefile

+++ b/build/generic/Makefile

@@ -107,6 +107,8 @@ $(BUILD_DIR):

 # Static Library

 #-----------------------------------------------------------------------------

+static_lib: $(STATIC_LIB)

+

 $(STATIC_LIB): $(BUILD_DIR) $(OBJECTS)

 	@echo "  L: $(@F)"

 	@cd $(BUILD_DIR) && ar rc $(@F) $(OBJECTS) && $(RANLIB) $(@F)

@@ -126,6 +128,8 @@ $(STATIC_LIB): $(BUILD_DIR) $(OBJECTS)

 #      platforms

 #-----------------------------------------------------------------------------

+shared_lib: $(SHARED_LIB)

+

 $(SHARED_LIB): $(BUILD_DIR) $(OBJECTS)

 	@echo "  L: $(@F)"

 	@$(INSTALL) -m 644 libxvidcore.def $(BUILD_DIR)/libxvidcore.def

@@ -136,6 +140,24 @@ $(SHARED_LIB): $(BUILD_DIR) $(OBJECTS)

 # Installation

 #-----------------------------------------------------------------------------

+install_shared: $(BUILD_DIR)/$(SHARED_LIB)

+	@echo "  D: $(libdir)"

+	@$(INSTALL) -d $(DESTDIR)$(libdir)

+	@echo "  I: $(libdir)/$(SHARED_LIB)"

+	@$(INSTALL) -m 644 $(BUILD_DIR)/$(SHARED_LIB) $(DESTDIR)$(libdir)/$(SHARED_LIB)

+

+install_static: $(BUILD_DIR)/$(STATIC_LIB)

+	@echo "  D: $(libdir)"

+	@$(INSTALL) -d $(DESTDIR)$(libdir)

+	@echo "  I: $(libdir)/$(STATIC_LIB)"

+	@$(INSTALL) -m 644 $(BUILD_DIR)/$(STATIC_LIB) $(DESTDIR)$(libdir)/$(STATIC_LIB)

+

+install_header:

+	@echo "  D: $(includedir)"

+	@$(INSTALL) -d $(DESTDIR)$(includedir)

+	@echo "  I: $(includedir)/xvid.h"

+	@$(INSTALL) -m 644 $(SRC_DIR)/xvid.h $(DESTDIR)$(includedir)/xvid.h

+

 install: $(BUILD_DIR)/$(STATIC_LIB) $(BUILD_DIR)/$(SHARED_LIB)

 	@echo "  D: $(libdir)"

 	@$(INSTALL) -d $(DESTDIR)$(libdir)

diff --git a/src/motion/estimation_bvop.c b/src/motion/estimation_bvop.c

index 62c6cd0..831395f 100644

--- a/src/motion/estimation_bvop.c

+++ b/src/motion/estimation_bvop.c

@@ -1104,7 +1104,7 @@ SMPMotionEstimationBVOP(SMPmotionData * h)

 	const int32_t time_bp = h->time_bp;

 	const int32_t time_pp = h->time_pp;

 	/* forward (past) reference */

-	const MACROBLOCK * const f_mbs = h->f_mbs;

+	//const MACROBLOCK * const f_mbs = h->f_mbs;

 	const IMAGE * const f_ref = h->fRef;

 	const IMAGE * const f_refH = h->fRefH;

 	const IMAGE * const f_refV = h->fRefV;

diff --git a/src/motion/estimation_pvop.c b/src/motion/estimation_pvop.c

index fe62ede..a70250b 100644

--- a/src/motion/estimation_pvop.c

+++ b/src/motion/estimation_pvop.c

@@ -904,13 +904,13 @@ MotionEstimation(MBParam * const pParam,

 	const uint32_t mb_height = pParam->mb_height;

 	const uint32_t iEdgedWidth = pParam->edged_width;

 	const uint32_t MotionFlags = MakeGoodMotionFlags(current->motion_flags, current->vop_flags, current->vol_flags);

-	int stat_thresh = 0;

+	//int stat_thresh = 0;

 	int MVmax = 0, mvSum = 0, mvCount = 0;

 	uint32_t x, y;

 	int sad00;

-	int skip_thresh = INITIAL_SKIP_THRESH * \

-		(current->vop_flags & XVID_VOP_MODEDECISION_RD ? 2:1);

+	/* int skip_thresh = INITIAL_SKIP_THRESH * \

+		(current->vop_flags & XVID_VOP_MODEDECISION_RD ? 2:1); */

 	int block = 0;

 	/* some pre-initialized thingies for SearchP */

@@ -1005,15 +1005,15 @@ MotionEstimateSMP(SMPmotionData * h)

 	const uint32_t mb_width = pParam->mb_width;

 	const uint32_t mb_height = pParam->mb_height;

 	const uint32_t iEdgedWidth = pParam->edged_width;

-	int stat_thresh = 0;

+	//int stat_thresh = 0;

 	int MVmax = 0, mvSum = 0, mvCount = 0;

 	int y_step = h->y_step;

 	int start_y = h->start_y;

 	uint32_t x, y;

 	int sad00;

-	int skip_thresh = INITIAL_SKIP_THRESH * \

-		(current->vop_flags & XVID_VOP_MODEDECISION_RD ? 2:1);

+	/* int skip_thresh = INITIAL_SKIP_THRESH * \

+		(current->vop_flags & XVID_VOP_MODEDECISION_RD ? 2:1); */

 	int block = start_y*mb_width;

 	int * complete_count_self = h->complete_count_self;

 	const volatile int * complete_count_above = h->complete_count_above;