Changeset 4155

Timestamp:

05/23/08 17:41:36 (5 years ago)

Author:

piers

Message:

Patched these files so symbols don't clash with ffmpeg when the following libraries are built: libxvidcore.a and libmp3lame.a. Patch submitted by Brook Milligan 8nov07 - I patched them a while back but only just committed them.

Location:

vic/branches/mpeg4/codec

Files:

• h263/getgob.c (modified) (2 diffs)
• h263/h263decoder.h (modified) (2 diffs)
• h263/reconh263.c (modified) (4 diffs)
• tmndec/getbits.c (modified) (2 diffs)
• tmndec/getblk.c (modified) (6 diffs)
• tmndec/gethdr.c (modified) (57 diffs)
• tmndec/getpic.c (modified) (24 diffs)
• tmndec/getvlc.c (modified) (6 diffs)
• tmndec/global.h (modified) (2 diffs)
• tmndec/recon.c (modified) (3 diffs)
• tmndec/sac.c (modified) (2 diffs)

vic/branches/mpeg4/codec/h263/getgob.c

@@ -1501 +1501 @@
       
       /* chroma rounding (table 16/H.263) */
-      BMVx = SGN(xvec)*(roundtab[abs(xvec)%16]+(abs(xvec)/16)*2);
-      BMVy = SGN(yvec)*(roundtab[abs(yvec)%16]+(abs(yvec)/16)*2);
+      BMVx = SGN(xvec)*(vic_roundtab[abs(xvec)%16]+(abs(xvec)/16)*2);
+      BMVy = SGN(yvec)*(vic_roundtab[abs(yvec)%16]+(abs(yvec)/16)*2);
     }
   }
@@ -1523 +1523 @@
       
       /* chroma rounding (table 16/H.263) */
-      BMVx = SGN(xvec)*(roundtab[abs(xvec)%16] +(abs(xvec)/16)*2);
-      BMVy = SGN(yvec)*(roundtab[abs(yvec)%16] +(abs(yvec)/16)*2);
+      BMVx = SGN(xvec)*(vic_roundtab[abs(xvec)%16] +(abs(xvec)/16)*2);
+      BMVy = SGN(yvec)*(vic_roundtab[abs(yvec)%16] +(abs(yvec)/16)*2);
     }
   }

vic/branches/mpeg4/codec/h263/h263decoder.h

@@ -63 +63 @@
 
 #ifdef notextern
-int roundtab[16]
+int vic_roundtab[16]
 #ifdef DEFINE_GLOBALS
 = {0,0,0,1,1,1,1,1,1,1,1,1,1,1,2,2}
@@ -75 +75 @@
 ;
 #else
-extern int roundtab[];
+extern int vic_roundtab[];
 extern int bquant_tab[];
 #endif

vic/branches/mpeg4/codec/h263/reconh263.c

@@ -100 +100 @@
         sum = h263Data->MV[0][1][y][x]+h263Data->MV[0][2][y][x]+
           h263Data->MV[0][3][y][x]+h263Data->MV[0][4][y][x];
-        dx = SGN(sum)*(roundtab[abs(sum)%16] + (abs(sum)/16)*2);
+        dx = SGN(sum)*(vic_roundtab[abs(sum)%16] + (abs(sum)/16)*2);
 
         sum = h263Data->MV[1][1][y][x]+h263Data->MV[1][2][y][x]+
           h263Data->MV[1][3][y][x]+h263Data->MV[1][4][y][x];
-        dy = SGN(sum)*(roundtab[abs(sum)%16] + (abs(sum)/16)*2);
+        dy = SGN(sum)*(vic_roundtab[abs(sum)%16] + (abs(sum)/16)*2);
 
       }
@@ -157 +157 @@
 
         /* chroma rounding (table 16/H.263) */
-        dx = SGN(xvec)*(roundtab[abs(xvec)%16] + (abs(xvec)/16)*2);
-        dy = SGN(yvec)*(roundtab[abs(yvec)%16] + (abs(yvec)/16)*2);
+        dx = SGN(xvec)*(vic_roundtab[abs(xvec)%16] + (abs(xvec)/16)*2);
+        dy = SGN(yvec)*(vic_roundtab[abs(yvec)%16] + (abs(yvec)/16)*2);
 
         lx>>=1;bx>>=1; lx2>>=1;
@@ -181 +181 @@
 
         /* chroma rounding (table 16/H.263) */
-        dx = SGN(xvec)*(roundtab[abs(xvec)%16] + (abs(xvec)/16)*2);
-        dy = SGN(yvec)*(roundtab[abs(yvec)%16] + (abs(yvec)/16)*2);
+        dx = SGN(xvec)*(vic_roundtab[abs(xvec)%16] + (abs(xvec)/16)*2);
+        dy = SGN(yvec)*(vic_roundtab[abs(yvec)%16] + (abs(yvec)/16)*2);
 
         /* Chroma */
@@ -204 +204 @@
 
       /* chroma rounding (table 16/H.263) */ 
-      dx = SGN(xvec)*(roundtab[abs(xvec)%16] + (abs(xvec)/16)*2);
-      dy = SGN(yvec)*(roundtab[abs(yvec)%16] + (abs(yvec)/16)*2);
+      dx = SGN(xvec)*(vic_roundtab[abs(xvec)%16] + (abs(xvec)/16)*2);
+      dy = SGN(yvec)*(vic_roundtab[abs(yvec)%16] + (abs(yvec)/16)*2);
 
       /* Chroma */

vic/branches/mpeg4/codec/tmndec/getbits.c

@@ -159 +159 @@
 unsigned int getbits1 ()
 {
-  return getbits (1);
+  return vic_getbits (1);
 }
 
@@ -177 +177 @@
 /* return next n bits (right adjusted) */
 
-unsigned int getbits (int n)
+unsigned int vic_getbits (int n)
 {
   unsigned int l;

vic/branches/mpeg4/codec/tmndec/getblk.c

@@ -158 +158 @@
         store_code[coeff_ind].last = last;
 
-        i += run = getbits (6);
+        i += run = vic_getbits (6);
         store_code[coeff_ind].run = run;
 
-        level = getbits (8);
+        level = vic_getbits (8);
         store_code[coeff_ind].level = level;
 
@@ -167 +167 @@
         if (level == 128 && modified_quantization_mode)
         {
-          level = getbits (11);
+          level = vic_getbits (11);
           store_code[coeff_ind].extended_level = level;
         }
       } else
       {
-        store_code[coeff_ind].sign = getbits (1);
+        store_code[coeff_ind].sign = vic_getbits (1);
         i += run;
       }
@@ -345 +345 @@
           printbits (showbits (6), 6, 6);
         }
-        i += run = getbits (6);
+        i += run = vic_getbits (6);
         if (trace)
         {
@@ -351 +351 @@
           printbits (showbits (8), 8, 8);
         }
-        level = getbits (8);
+        level = vic_getbits (8);
 
         if ((sign = (level >= 128)))
@@ -361 +361 @@
         {
           /* extended escape code was received */
-          level = getbits (11);
+          level = vic_getbits (11);
           level = (level >> 6 & 0x001F) | level << 5;
           /* correctly set the sign */
@@ -375 +375 @@
         i += run;
         val = level;
-        sign = getbits (1);
+        sign = vic_getbits (1);
         if (trace)
           fprintf (trace_file, "%d", sign);

vic/branches/mpeg4/codec/tmndec/gethdr.c

@@ -79 +79 @@
   /* look for startcode */
   startcode ();
-  code = getbits (PSC_LENGTH);
-  gob = getbits (5);
+  code = vic_getbits (PSC_LENGTH);
+  gob = vic_getbits (5);
   if (gob == SE_CODE)
     return 0;
@@ -132 +132 @@
 
   prev_plus_P_temp_ref = temp_ref;
-  temp_ref = getbits (8);
+  temp_ref = vic_getbits (8);
   if (trace)
   {
@@ -141 +141 @@
     trd += 256;
 
-  tmp = getbits (1);            /* always "1" */
+  tmp = vic_getbits (1);            /* always "1" */
   if (trace)
     fprintf (trace_file, "\nSpare: %d", tmp);
@@ -147 +147 @@
     if (!quiet)
       printf ("warning: spare in picture header should be \"1\"\n");
-  tmp = getbits (1);            /* always "0" */
+  tmp = vic_getbits (1);            /* always "0" */
   if (trace)
     fprintf (trace_file, "\nH.261 distinction bit: %d", tmp);
@@ -153 +153 @@
     if (!quiet)
       printf ("warning: H.261 distinction bit should be \"0\"\n");
-  tmp = getbits (1);            /* split_screen_indicator */
+  tmp = vic_getbits (1);            /* split_screen_indicator */
   if (trace)
     fprintf (trace_file, "\nsplit_screen_indicator: %d", tmp);
@@ -162 +162 @@
     exit (-1);
   }
-  tmp = getbits (1);            /* document_camera_indicator */
+  tmp = vic_getbits (1);            /* document_camera_indicator */
   if (trace)
     fprintf (trace_file, "\ndocument_camera_indicator: %d", tmp);
@@ -169 +169 @@
       printf ("warning: document camera indicator not supported in this version\n");
 
-  tmp = getbits (1);            /* freeze_picture_release */
+  tmp = vic_getbits (1);            /* freeze_picture_release */
   if (trace)
     fprintf (trace_file, "\nfreeze_picture_release: %d", tmp);
@@ -175 +175 @@
     if (!quiet)
       printf ("warning: frozen picture not supported in this version\n");
-  tmp = getbits (3);
+  tmp = vic_getbits (3);
   if (trace)
   {
@@ -187 +187 @@
       fprintf (trace_file, "\n----------EXTENDED_PTYPE----------");
     plus_type = 1;
-    UFEP = getbits (3);
+    UFEP = vic_getbits (3);
     if (trace)
     {
@@ -198 +198 @@
         fprintf (trace_file, "\n----------OPTIONAL PLUS PTYPE----------");
       source_format_old = source_format;
-      source_format = getbits (3);
+      source_format = vic_getbits (3);
       if (trace)
       {
@@ -206 +206 @@
     
       /* optional custom picture clock frequency */
-      optional_custom_PCF = getbits (1);
+      optional_custom_PCF = vic_getbits (1);
       if (trace)
       {
@@ -218 +218 @@
         exit (-1);
       }
-      mv_outside_frame = getbits (1);
+      mv_outside_frame = vic_getbits (1);
       if (trace)
       {
@@ -225 +225 @@
       }
       long_vectors = (mv_outside_frame ? 1 : 0);
-      syntax_arith_coding = getbits (1);
+      syntax_arith_coding = vic_getbits (1);
       if (trace)
       {
@@ -231 +231 @@
         printbits (syntax_arith_coding, 1, 1);
       }
-      adv_pred_mode = getbits (1);
+      adv_pred_mode = vic_getbits (1);
       if (trace)
       {
@@ -241 +241 @@
       use_4mv = (adv_pred_mode ? 1 : 0);
       pb_frame = 0;
-      advanced_intra_coding = getbits (1);
+      advanced_intra_coding = vic_getbits (1);
       if (trace)
       {
@@ -247 +247 @@
         printbits (advanced_intra_coding, 1, 1);
       }
-      deblocking_filter_mode = getbits (1);
+      deblocking_filter_mode = vic_getbits (1);
       if (trace)
       {
@@ -256 +256 @@
       use_4mv = (deblocking_filter_mode ? 1 : use_4mv);
 
-      slice_structured_mode = getbits (1);
+      slice_structured_mode = vic_getbits (1);
       if (trace)
       {
@@ -268 +268 @@
         exit (-1);
       }
-      reference_picture_selection_mode = getbits (1);
+      reference_picture_selection_mode = vic_getbits (1);
       if (trace)
       {
@@ -282 +282 @@
       }
 #endif
-      independently_segmented_decoding_mode = getbits (1);
+      independently_segmented_decoding_mode = vic_getbits (1);
       if (trace)
       {
@@ -294 +294 @@
         exit (-1);
       }
-      alternative_inter_VLC_mode = getbits (1);
+      alternative_inter_VLC_mode = vic_getbits (1);
       if (trace)
       {
@@ -300 +300 @@
         printbits (alternative_inter_VLC_mode, 1, 1);
       }
-      modified_quantization_mode = getbits (1);
+      modified_quantization_mode = vic_getbits (1);
       if (trace)
       {
@@ -306 +306 @@
         printbits (modified_quantization_mode, 1, 1);
       }
-      tmp = getbits (4);
+      tmp = vic_getbits (4);
       if (trace)
       {
@@ -347 +347 @@
       if (trace)
         fprintf (trace_file, "\n----------MANDATORY PLUS PTYPE----------");
-      pict_type = getbits (3);
+      pict_type = vic_getbits (3);
       if (trace)
       {
@@ -373 +373 @@
       }
 
-      reference_picture_resampling_mode = getbits (1);
+      reference_picture_resampling_mode = vic_getbits (1);
       if (trace)
       {
@@ -385 +385 @@
         exit (-1);
       }
-      reduced_resolution_update_mode = getbits (1);
+      reduced_resolution_update_mode = vic_getbits (1);
       if (trace)
       {
@@ -397 +397 @@
         exit (-1);
       }
-      rtype = getbits (1);      /* rounding type */
+      rtype = vic_getbits (1);      /* rounding type */
       if (trace)
       {
@@ -408 +408 @@
         printbits (rtype, 1, 1);
       }
-      tmp = getbits (3);
+      tmp = vic_getbits (3);
       if (trace)
       {
@@ -427 +427 @@
     }
 
-    tmp = getbits (1);
+    tmp = vic_getbits (1);
     if (trace)
     {
@@ -445 +445 @@
       if (trace)
         fprintf (trace_file, "\ncustom picture format \n");
-      CP_PAR_code = getbits (4);
+      CP_PAR_code = vic_getbits (4);
       if (trace)
       {
@@ -459 +459 @@
         exit(-1);
       }
-      tmp=getbits (9);
+      tmp=vic_getbits (9);
       horizontal_size = (tmp + 1 ) * 4;
       if (trace)
@@ -466 +466 @@
         printbits (tmp, 9, 9);
       }
-      tmp = getbits (1);
+      tmp = vic_getbits (1);
       if (trace)
       {
@@ -478 +478 @@
         exit (-1);
       }
-      tmp = getbits (8);
+      tmp = vic_getbits (8);
       vertical_size = tmp * 4;
       if (trace)
@@ -496 +496 @@
       if (CP_PAR_code == EXTENDED_PAR)
       {
-        PAR_width = getbits (8);
-        PAR_height = getbits (8);
+        PAR_width = vic_getbits (8);
+        PAR_height = vic_getbits (8);
       }
     }
@@ -533 +533 @@
       if (UFEP)
       {
-        clock_conversion_code = getbits (1);
+        clock_conversion_code = vic_getbits (1);
         if (trace)
         {
@@ -539 +539 @@
           printbits (clock_conversion_code, 1, 1);
         }
-        clock_divisor = getbits (7);
+        clock_divisor = vic_getbits (7);
         if (trace)
         {
@@ -548 +548 @@
       }
       /* regardless of the value of UFEP */
-      extended_temporal_reference = getbits (2);
+      extended_temporal_reference = vic_getbits (2);
       if (trace)
       {
@@ -569 +569 @@
     if (UFEP && slice_structured_mode)
     {
-      SSS_rectangular_slices = getbits (1);
+      SSS_rectangular_slices = vic_getbits (1);
       if (trace)
       {
@@ -575 +575 @@
         printbits (SSS_rectangular_slices, 1, 1);
       }
-      SSS_arbitary_slice_ordering = getbits (1);
+      SSS_arbitary_slice_ordering = vic_getbits (1);
       if (trace)
       {
@@ -586 +586 @@
     {
       /* optional temporal, SNR and spatial scalability mode in use */
-      enhancement_layer_num = getbits (4);
+      enhancement_layer_num = vic_getbits (4);
       if (trace)
       {
@@ -594 +594 @@
       if (UFEP)
       {
-        reference_layer_number = getbits (4);
+        reference_layer_number = vic_getbits (4);
         if (trace)
         {
@@ -633 +633 @@
       if (UFEP)
       {
-        MF_of_reference_picture_selection = getbits (3);
+        MF_of_reference_picture_selection = vic_getbits (3);
         if (trace)
         {
@@ -640 +640 @@
         }
       }
-      TRPI = getbits (1);
+      TRPI = vic_getbits (1);
       if (trace)
       {
@@ -649 +649 @@
       {
         /* temporal reference for prediction exists */
-        temporal_reference_for_prediction = getbits (10);
+        temporal_reference_for_prediction = vic_getbits (10);
         if (trace)
         {
@@ -657 +657 @@
       }
       /* draft20: 1=yes, 01=no */
-      BCI = getbits (1);
-      if (!BCI) getbits(1);
+      BCI = vic_getbits (1);
+      if (!BCI) vic_getbits(1);
       if (trace)
       {
@@ -680 +680 @@
     }
 
-    pic_quant = getbits (5);
+    pic_quant = vic_getbits (5);
     quant = pic_quant;
 
@@ -712 +712 @@
     trd = temp_ref - prev_plus_P_temp_ref;
 
-    pict_type = getbits (1);
+    pict_type = vic_getbits (1);
     if (trace)
     {
@@ -718 +718 @@
       printbits (pict_type, 1, 1);
     }
-    mv_outside_frame = getbits (1);
+    mv_outside_frame = vic_getbits (1);
     if (trace)
     {
@@ -725 +725 @@
     }
     long_vectors = (mv_outside_frame ? 1 : 0);
-    syntax_arith_coding = getbits (1);
+    syntax_arith_coding = vic_getbits (1);
     if (trace)
     {
@@ -731 +731 @@
       printbits (syntax_arith_coding, 1, 1);
     }
-    adv_pred_mode = getbits (1);
+    adv_pred_mode = vic_getbits (1);
     if (trace)
     {
@@ -740 +740 @@
     overlapping_MC = (adv_pred_mode ? 1 : 0);
     use_4mv = (adv_pred_mode ? 1 : 0);
-    pb_frame = getbits (1);
+    pb_frame = vic_getbits (1);
     if (trace)
     {
@@ -747 +747 @@
     }
    
-    pic_quant = getbits (5);
+    pic_quant = vic_getbits (5);
     quant = pic_quant;
 
@@ -756 +756 @@
     }
 
-    tmp = getbits (1);
+    tmp = vic_getbits (1);
     if (trace)
     {
@@ -774 +774 @@
     if (optional_custom_PCF)
     {
-      trb = getbits (5);
+      trb = vic_getbits (5);
       if (trace)
       {
@@ -782 +782 @@
     } else
     {
-      trb = getbits (3);
+      trb = vic_getbits (3);
       if (trace)
       {
@@ -790 +790 @@
     }
 
-    bquant = getbits (2);
+    bquant = vic_getbits (2);
     if (trace)
     {
@@ -806 +806 @@
 #endif
 
-  pei = getbits (1);
+  pei = vic_getbits (1);
   if (trace)
   {
@@ -817 +817 @@
   {
     /* extra info for possible future backward compatible additions */
-    getbits (8);                /* not used */
-    pei = getbits (1);
+    vic_getbits (8);                /* not used */
+    pei = vic_getbits (1);
     if (pei)
       goto pspare;              /* keep on reading pspare until pei=0 */

vic/branches/mpeg4/codec/tmndec/getpic.c

@@ -405 +405 @@
           /* GFID is not allowed to change unless PTYPE in picture header
            * changes */
-          gfid = getbits (2);
+          gfid = vic_getbits (2);
           if (trace)
           {
@@ -415 +415 @@
            * has changed, has been lost */
 
-          quant = getbits (5);
+          quant = vic_getbits (5);
           if (trace)
           {
@@ -554 +554 @@
             /* using VLC */            
             if (!showbits (1))            
-              INTRA_AC_DC = getbits (1);              
+              INTRA_AC_DC = vic_getbits (1);              
             else            
-              INTRA_AC_DC = getbits (2);            
+              INTRA_AC_DC = vic_getbits (2);            
           }          
           if (trace)          
@@ -603 +603 @@
             } 
             else            
-              CBPB = getbits (6); 
+              CBPB = vic_getbits (6); 
             
             if (trace)              
@@ -673 +673 @@
           if (!modified_quantization_mode)
           {
-            DQUANT = getbits (2);
+            DQUANT = vic_getbits (2);
             quant += DQ_tab[DQUANT];
             if (trace)
@@ -684 +684 @@
           else
           {
-            tmp = getbits (1);
+            tmp = vic_getbits (1);
             if (tmp)
             {
               /* only one more additional bit was sent */
-              tmp = getbits (1);
+              tmp = vic_getbits (1);
               if (tmp)
               {
@@ -711 +711 @@
               /* five additional bits were sent as            
                * DQUANT */
-              DQUANT = getbits (5);
+              DQUANT = vic_getbits (5);
               quant = DQUANT;
               if (trace)
@@ -1107 +1107 @@
           else
           {
-            bp[0] = getbits (8);
+            bp[0] = vic_getbits (8);
             if (trace)
             {
@@ -1326 +1326 @@
           /* GFID is not allowed to change unless PTYPE in picture header
            * changes */
-          gfid = getbits (2);
+          gfid = vic_getbits (2);
           if (trace)
           {
@@ -1336 +1336 @@
            * has changed, has been lost */
 
-          quant = getbits (5);
+          quant = vic_getbits (5);
           if (trace)
           {
@@ -1398 +1398 @@
         /* get INTRA_AC_DC mode for annex I */
         if (!showbits (1))
-          INTRA_AC_DC = getbits (1);
+          INTRA_AC_DC = vic_getbits (1);
         else
-          INTRA_AC_DC = getbits (2);
+          INTRA_AC_DC = vic_getbits (2);
 
         if (trace)
@@ -1466 +1466 @@
           if (!modified_quantization_mode)
           {
-            DQUANT = getbits (2);
+            DQUANT = vic_getbits (2);
             quant += DQ_tab[DQUANT];
             if (trace)
@@ -1477 +1477 @@
           else
           {
-            tmp = getbits (1);
+            tmp = vic_getbits (1);
             if (tmp)
             {                   /* only one more additional bit was sent */
-              tmp = getbits (1);
+              tmp = vic_getbits (1);
               if (tmp)
               {                 /* second bit of quant is 1 */
@@ -1499 +1499 @@
             {                   /* five additional bits were sent as
                                  * DQUANT */
-              DQUANT = getbits (5);
+              DQUANT = vic_getbits (5);
               quant = DQUANT;
               if (trace)
@@ -1811 +1811 @@
           /* Intra (except in advanced intra coding mode) */
           bp = ld->block[comp];
-          bp[0] = getbits (8);
+          bp[0] = vic_getbits (8);
           if (trace)
           {
@@ -1992 +1992 @@
           /* GFID is not allowed to change unless PTYPE in picture header
            * changes */
-          gfid = getbits (2);
+          gfid = vic_getbits (2);
           if (trace)
           {
@@ -2002 +2002 @@
            * has changed, has been lost */
 
-          quant = getbits (5);
+          quant = vic_getbits (5);
           if (trace)
           {
@@ -2064 +2064 @@
         /* get INTRA_AC_DC mode for annex I */
         if (!showbits (1))
-          INTRA_AC_DC = getbits (1);
+          INTRA_AC_DC = vic_getbits (1);
         else
-          INTRA_AC_DC = getbits (2);
+          INTRA_AC_DC = vic_getbits (2);
 
         if (trace)
@@ -2137 +2137 @@
           if (!modified_quantization_mode)
           {
-            DQUANT = getbits (2);
+            DQUANT = vic_getbits (2);
             quant += DQ_tab[DQUANT];
             if (trace)
@@ -2148 +2148 @@
           else
           {
-            tmp = getbits (1);
+            tmp = vic_getbits (1);
             if (tmp)
             {                   /* only one more additional bit was sent */
-              tmp = getbits (1);
+              tmp = vic_getbits (1);
               if (tmp)
               {                 /* second bit of quant is 1 */
@@ -2170 +2170 @@
             {                   /* five additional bits were sent as
                                  * DQUANT */
-              DQUANT = getbits (5);
+              DQUANT = vic_getbits (5);
               quant = DQUANT;
               if (trace)
@@ -2406 +2406 @@
           /* Intra (except in advanced intra coding mode) */
           bp = ld->block[comp];
-          bp[0] = getbits (8);
+          bp[0] = vic_getbits (8);
           if (trace)
           {
@@ -2616 +2616 @@
 
       /* chroma rounding (table 16/H.263) */
-      BMVx = sign (xvec) * (roundtab[abs (xvec) % 16] + (abs (xvec) / 16) * 2);
-      BMVy = sign (yvec) * (roundtab[abs (yvec) % 16] + (abs (yvec) / 16) * 2);
+      BMVx = sign (xvec) * (vic_roundtab[abs (xvec) % 16] + (abs (xvec) / 16) * 2);
+      BMVy = sign (yvec) * (vic_roundtab[abs (yvec) % 16] + (abs (yvec) / 16) * 2);
     }
   } else
@@ -2639 +2639 @@
 
       /* chroma rounding (table 16/H.263) */
-      BMVx = sign (xvec) * (roundtab[abs (xvec) % 16] + (abs (xvec) / 16) * 2);
-      BMVy = sign (yvec) * (roundtab[abs (yvec) % 16] + (abs (yvec) / 16) * 2);
+      BMVx = sign (xvec) * (vic_roundtab[abs (xvec) % 16] + (abs (xvec) / 16) * 2);
+      BMVy = sign (yvec) * (vic_roundtab[abs (yvec) % 16] + (abs (yvec) / 16) * 2);
     }
   }

vic/branches/mpeg4/codec/tmndec/getvlc.c

@@ -151 +151 @@
     return 0;
   }
-  code = 2 + getbits(1);
-  while (getbits(1))
+  code = 2 + vic_getbits(1);
+  while (vic_getbits(1))
   {
     code <<= 1;
-    code += getbits(1);
+    code += vic_getbits(1);
   }
   sign = code & 1;
@@ -399 +399 @@
   if (pict_type == PCT_IPB)
   {
-    code = getbits (1);
+    code = vic_getbits (1);
     if (code == 0)
     {
@@ -408 +408 @@
     else
     {
-      code=getbits (1);
+      code=vic_getbits (1);
       if (code==0)
       {
@@ -417 +417 @@
       else
       {
-        code=getbits (1);
+        code=vic_getbits (1);
         if (code==0) 
         {
@@ -426 +426 @@
         else
         {
-          code=getbits (1);
+          code=vic_getbits (1);
           if (code==0) 
           {
@@ -435 +435 @@
           else
           {
-            code=getbits (1);
+            code=vic_getbits (1);
             if (code==0) 
             {

vic/branches/mpeg4/codec/tmndec/global.h

@@ -85 +85 @@
 unsigned int getbits1 _ANSI_ARGS_ ((void));
 void flushbits _ANSI_ARGS_ ((int n));
-unsigned int getbits _ANSI_ARGS_ ((int n));
+unsigned int vic_getbits _ANSI_ARGS_ ((int n));
 
 /* getblk.c */
@@ -427 +427 @@
 ;
 
-EXTERN int roundtab[16]
+EXTERN int vic_roundtab[16]
 #ifdef GLOBAL
 = {0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2}

vic/branches/mpeg4/codec/tmndec/recon.c

@@ -153 +153 @@
 
         sum = MV[0][1][y][x] + MV[0][2][y][x] + MV[0][3][y][x] + MV[0][4][y][x];
-        dx = sign (sum) * (roundtab[abs (sum) % 16] + (abs (sum) / 16) * 2);
+        dx = sign (sum) * (vic_roundtab[abs (sum) % 16] + (abs (sum) / 16) * 2);
 
         sum = MV[1][1][y][x] + MV[1][2][y][x] + MV[1][3][y][x] + MV[1][4][y][x];
-        dy = sign (sum) * (roundtab[abs (sum) % 16] + (abs (sum) / 16) * 2);
+        dy = sign (sum) * (vic_roundtab[abs (sum) % 16] + (abs (sum) / 16) * 2);
 
       } else
@@ -273 +273 @@
 
         /* chroma rounding (table 16/H.263) */
-        dx = sign (xvec) * (roundtab[abs (xvec) % 16] + (abs (xvec) / 16) * 2);
-        dy = sign (yvec) * (roundtab[abs (yvec) % 16] + (abs (yvec) / 16) * 2);
+        dx = sign (xvec) * (vic_roundtab[abs (xvec) % 16] + (abs (xvec) / 16) * 2);
+        dy = sign (yvec) * (vic_roundtab[abs (yvec) % 16] + (abs (yvec) / 16) * 2);
 
         lx >>= 1;
@@ -305 +305 @@
 
         /* chroma rounding (table 16/H.263) */
-        dx = sign (xvec) * (roundtab[abs (xvec) % 16] + (abs (xvec) / 16) * 2);
-        dy = sign (yvec) * (roundtab[abs (yvec) % 16] + (abs (yvec) / 16) * 2);
+        dx = sign (xvec) * (vic_roundtab[abs (xvec) % 16] + (abs (xvec) / 16) * 2);
+        dy = sign (yvec) * (vic_roundtab[abs (yvec) % 16] + (abs (yvec) / 16) * 2);
 
         /* Chroma */

vic/branches/mpeg4/codec/tmndec/sac.c

@@ -192 +192 @@
                                  * Decoder FIFO */
 
-    bit = getbits (1);
+    bit = vic_getbits (1);
 
     if (zerorun > 13)
@@ -205 +205 @@
         if (trace)
           fprintf (trace_file, "Removing Startcode Emulation Prevention bit \n");
-        bit = getbits (1);      /* overwrite the last bit */
+        bit = vic_getbits (1);      /* overwrite the last bit */
         zerorun = !bit;         /* zerorun=1 if bit is a '0' */
       }