# HG changeset patch
# User mru
# Date 1278799958 0
# Node ID 55abf5e0817284fdb621a278efa276607cca391d
# Parent  7fc1f051a19f9d9d499f37ce30948f9663c014d1
Add av_ prefix to bswap macros

diff -r 7fc1f051a19f -r 55abf5e08172 libswscale/rgb2rgb.c
--- a/libswscale/rgb2rgb.c	Sat Jul 10 20:48:50 2010 +0000
+++ b/libswscale/rgb2rgb.c	Sat Jul 10 22:12:38 2010 +0000
@@ -231,7 +231,7 @@
 {
     long i;
     for (i=0; i<num_pixels; i++)
-        ((uint16_t *)dst)[i] = bswap_16(((const uint16_t *)palette)[src[i]]);
+        ((uint16_t *)dst)[i] = av_bswap16(((const uint16_t *)palette)[src[i]]);
 }
 #endif
 
diff -r 7fc1f051a19f -r 55abf5e08172 libswscale/swscale.c
--- a/libswscale/swscale.c	Sat Jul 10 20:48:50 2010 +0000
+++ b/libswscale/swscale.c	Sat Jul 10 22:12:38 2010 +0000
@@ -1659,7 +1659,7 @@
 
                 for (i=0; i<height; i++) {
                     for (j=0; j<length; j++)
-                        ((uint16_t*)dstPtr)[j] = bswap_16(((const uint16_t*)srcPtr)[j]);
+                        ((uint16_t*)dstPtr)[j] = av_bswap16(((const uint16_t*)srcPtr)[j]);
                     srcPtr+= srcStride[plane];
                     dstPtr+= dstStride[plane];
                 }
diff -r 7fc1f051a19f -r 55abf5e08172 libswscale/yuv2rgb.c
--- a/libswscale/yuv2rgb.c	Sat Jul 10 20:48:50 2010 +0000
+++ b/libswscale/yuv2rgb.c	Sat Jul 10 22:12:38 2010 +0000
@@ -774,7 +774,7 @@
         }
         if (isNotNe)
             for (i = 0; i < 1024*3; i++)
-                y_table16[i] = bswap_16(y_table16[i]);
+                y_table16[i] = av_bswap16(y_table16[i]);
         fill_table(c->table_rV, 2, crv, y_table16 + yoffs);
         fill_table(c->table_gU, 2, cgu, y_table16 + yoffs + 1024);
         fill_table(c->table_bU, 2, cbu, y_table16 + yoffs + 2048);
@@ -797,7 +797,7 @@
         }
         if(isNotNe)
             for (i = 0; i < 1024*3; i++)
-                y_table16[i] = bswap_16(y_table16[i]);
+                y_table16[i] = av_bswap16(y_table16[i]);
         fill_table(c->table_rV, 2, crv, y_table16 + yoffs);
         fill_table(c->table_gU, 2, cgu, y_table16 + yoffs + 1024);
         fill_table(c->table_bU, 2, cbu, y_table16 + yoffs + 2048);