test/encode/avcenc: rename swap32() to va_swap32().
authorHaitao Huang <haitao.huang@intel.com>
Fri, 6 Jul 2012 12:08:47 +0000 (14:08 +0200)
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>
Fri, 6 Jul 2012 14:29:07 +0000 (16:29 +0200)
Signed-off-by: Haitao Huang <haitao.huang@intel.com>
test/encode/avcenc.c

index adaa28a..c4f3b3b 100644 (file)
@@ -672,7 +672,7 @@ get_coded_bitsteam_length(unsigned char *buffer, int buffer_length)
 #endif
 
 static unsigned int 
-swap32(unsigned int val)
+va_swap32(unsigned int val)
 {
     unsigned char *pval = (unsigned char *)&val;
 
@@ -698,7 +698,7 @@ bitstream_end(bitstream *bs)
     int bit_left = 32 - bit_offset;
 
     if (bit_offset) {
-        bs->buffer[pos] = swap32((bs->buffer[pos] << bit_left));
+        bs->buffer[pos] = va_swap32((bs->buffer[pos] << bit_left));
     }
 }
  
@@ -719,7 +719,7 @@ bitstream_put_ui(bitstream *bs, unsigned int val, int size_in_bits)
     } else {
         size_in_bits -= bit_left;
         bs->buffer[pos] = (bs->buffer[pos] << bit_left) | (val >> size_in_bits);
-        bs->buffer[pos] = swap32(bs->buffer[pos]);
+        bs->buffer[pos] = va_swap32(bs->buffer[pos]);
 
         if (pos + 1 == bs->max_size_in_dword) {
             bs->max_size_in_dword += BITSTREAM_ALLOCATE_STEPPING;