--- branches/dev-api-4/xvidcore/src/xvid.c 2003/02/22 08:49:45 890 +++ branches/dev-api-4/xvidcore/src/xvid.c 2003/06/09 01:25:19 1053 @@ -17,7 +17,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: xvid.c,v 1.45.2.1 2003-02-22 08:49:44 suxen_drol Exp $ + * $Id: xvid.c,v 1.45.2.5 2003-06-09 01:16:57 edgomez Exp $ * ****************************************************************************/ @@ -45,6 +45,10 @@ #include "utils/timer.h" #include "bitstream/mbcoding.h" +#if defined(_DEBUG) +unsigned int xvid_debug = 0; /* xvid debug mask */ +#endif + #if defined(ARCH_IS_IA32) #if defined(_MSC_VER) @@ -532,7 +536,11 @@ } #endif - return 0; +#if defined(_DEBUG) + xvid_debug = init->debug; +#endif + + return 0; } @@ -568,7 +576,9 @@ if (XVID_MAJOR(convert->version) != 1) /* v1.x.x */ return XVID_ERR_VERSION; - // const int flip1 = (convert->input.colorspace & XVID_CSP_VFLIP) ^ (convert->output.colorspace & XVID_CSP_VFLIP); +#if 0 + const int flip1 = (convert->input.colorspace & XVID_CSP_VFLIP) ^ (convert->output.colorspace & XVID_CSP_VFLIP); +#endif width = convert->width; height = convert->height; width2 = convert->width/2; @@ -640,7 +650,7 @@ { int i, diff = 0; for (i = 0; i < size; i++) - diff += ABS(blockA[i]-blockB[i]); + diff += abs(blockA[i]-blockB[i]); return diff; } @@ -1055,7 +1065,7 @@ (xvid_enc_stats_t *) param2); case XVID_ENC_CREATE: - return enc_create((xvid_enc_create_t *) param1, (xvid_enc_rc_t*)param2); + return enc_create((xvid_enc_create_t *) param1); case XVID_ENC_DESTROY: return enc_destroy((Encoder *) handle);