[FFmpeg-cvslog] r31679 - in trunk/libswscale: rgb2rgb.c swscale.c yuv2rgb.c

[mru]

Author: mru
Date: Sun Jul 11 00:12:38 2010
New Revision: 31679

Log:
Add av_ prefix to bswap macros

Modified:
   trunk/libswscale/rgb2rgb.c
   trunk/libswscale/swscale.c
   trunk/libswscale/yuv2rgb.c

Modified: trunk/libswscale/rgb2rgb.c
==============================================================================
--- trunk/libswscale/rgb2rgb.c	Sat Jul 10 22:48:50 2010	(r31678)
+++ trunk/libswscale/rgb2rgb.c	Sun Jul 11 00:12:38 2010	(r31679)
@@ -231,7 +231,7 @@ void palette8tobgr16(const uint8_t *src,
 {
     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
 

Modified: trunk/libswscale/swscale.c
==============================================================================
--- trunk/libswscale/swscale.c	Sat Jul 10 22:48:50 2010	(r31678)
+++ trunk/libswscale/swscale.c	Sun Jul 11 00:12:38 2010	(r31679)
@@ -1659,7 +1659,7 @@ static int planarCopyWrapper(SwsContext 
 
                 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];
                 }

Modified: trunk/libswscale/yuv2rgb.c
==============================================================================
--- trunk/libswscale/yuv2rgb.c	Sat Jul 10 22:48:50 2010	(r31678)
+++ trunk/libswscale/yuv2rgb.c	Sun Jul 11 00:12:38 2010	(r31679)
@@ -774,7 +774,7 @@ av_cold int ff_yuv2rgb_c_init_tables(Sws
         }
         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 @@ av_cold int ff_yuv2rgb_c_init_tables(Sws
         }
         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);