aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-07-10 22:12:38 +0000
committerMåns Rullgård <mans@mansr.com>2010-07-10 22:12:38 +0000
commit6a01eab73c297d89c7676bddfc32d5f796ae7950 (patch)
tree432d85f8bbb73da2cdcded789f8074a802fb48a2
parent8fc0162ac44f3e60798552ca6d19387be95cae4c (diff)
downloadffmpeg-6a01eab73c297d89c7676bddfc32d5f796ae7950.tar.gz
Add av_ prefix to bswap macros
Originally committed as revision 31679 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
-rw-r--r--libswscale/rgb2rgb.c2
-rw-r--r--libswscale/swscale.c2
-rw-r--r--libswscale/yuv2rgb.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c
index 983944de22..f92e165c6b 100644
--- a/libswscale/rgb2rgb.c
+++ b/libswscale/rgb2rgb.c
@@ -231,7 +231,7 @@ void palette8tobgr16(const uint8_t *src, uint8_t *dst, long num_pixels, const ui
{
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 --git a/libswscale/swscale.c b/libswscale/swscale.c
index 425feaabb0..159bf9cc81 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -1659,7 +1659,7 @@ static int planarCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[
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 --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c
index 70841a8f07..bd3fb93c3a 100644
--- a/libswscale/yuv2rgb.c
+++ b/libswscale/yuv2rgb.c
@@ -774,7 +774,7 @@ av_cold int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], int
}
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(SwsContext *c, const int inv_table[4], int
}
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);