Commit 57a7b841 authored by diego's avatar diego

The function names of [rgb|bgr]1[56]to[UV|Y] had rgb<->bgr flipped.

Rename them to match the actual implementation. Fixes issue 162.


git-svn-id: file:///var/local/repositories/mplayer/trunk/libswscale@24965 b3059339-0415-0410-9bf9-f77b7e298cf2
parent fa5825d2
...@@ -2073,7 +2073,7 @@ static inline void RENAME(bgr24ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1 ...@@ -2073,7 +2073,7 @@ static inline void RENAME(bgr24ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1
assert(src1 == src2); assert(src1 == src2);
} }
static inline void RENAME(bgr16ToY)(uint8_t *dst, uint8_t *src, int width) static inline void RENAME(rgb16ToY)(uint8_t *dst, uint8_t *src, int width)
{ {
int i; int i;
for (i=0; i<width; i++) for (i=0; i<width; i++)
...@@ -2087,7 +2087,7 @@ static inline void RENAME(bgr16ToY)(uint8_t *dst, uint8_t *src, int width) ...@@ -2087,7 +2087,7 @@ static inline void RENAME(bgr16ToY)(uint8_t *dst, uint8_t *src, int width)
} }
} }
static inline void RENAME(bgr16ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width) static inline void RENAME(rgb16ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width)
{ {
int i; int i;
assert(src1==src2); assert(src1==src2);
...@@ -2109,7 +2109,7 @@ static inline void RENAME(bgr16ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1 ...@@ -2109,7 +2109,7 @@ static inline void RENAME(bgr16ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1
} }
} }
static inline void RENAME(bgr15ToY)(uint8_t *dst, uint8_t *src, int width) static inline void RENAME(rgb15ToY)(uint8_t *dst, uint8_t *src, int width)
{ {
int i; int i;
for (i=0; i<width; i++) for (i=0; i<width; i++)
...@@ -2123,7 +2123,7 @@ static inline void RENAME(bgr15ToY)(uint8_t *dst, uint8_t *src, int width) ...@@ -2123,7 +2123,7 @@ static inline void RENAME(bgr15ToY)(uint8_t *dst, uint8_t *src, int width)
} }
} }
static inline void RENAME(bgr15ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width) static inline void RENAME(rgb15ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width)
{ {
int i; int i;
assert(src1==src2); assert(src1==src2);
...@@ -2206,7 +2206,7 @@ static inline void RENAME(rgb24ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1 ...@@ -2206,7 +2206,7 @@ static inline void RENAME(rgb24ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1
} }
} }
static inline void RENAME(rgb16ToY)(uint8_t *dst, uint8_t *src, int width) static inline void RENAME(bgr16ToY)(uint8_t *dst, uint8_t *src, int width)
{ {
int i; int i;
for (i=0; i<width; i++) for (i=0; i<width; i++)
...@@ -2220,7 +2220,7 @@ static inline void RENAME(rgb16ToY)(uint8_t *dst, uint8_t *src, int width) ...@@ -2220,7 +2220,7 @@ static inline void RENAME(rgb16ToY)(uint8_t *dst, uint8_t *src, int width)
} }
} }
static inline void RENAME(rgb16ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width) static inline void RENAME(bgr16ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width)
{ {
int i; int i;
assert(src1 == src2); assert(src1 == src2);
...@@ -2239,7 +2239,7 @@ static inline void RENAME(rgb16ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1 ...@@ -2239,7 +2239,7 @@ static inline void RENAME(rgb16ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1
} }
} }
static inline void RENAME(rgb15ToY)(uint8_t *dst, uint8_t *src, int width) static inline void RENAME(bgr15ToY)(uint8_t *dst, uint8_t *src, int width)
{ {
int i; int i;
for (i=0; i<width; i++) for (i=0; i<width; i++)
...@@ -2253,7 +2253,7 @@ static inline void RENAME(rgb15ToY)(uint8_t *dst, uint8_t *src, int width) ...@@ -2253,7 +2253,7 @@ static inline void RENAME(rgb15ToY)(uint8_t *dst, uint8_t *src, int width)
} }
} }
static inline void RENAME(rgb15ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width) static inline void RENAME(bgr15ToUV)(uint8_t *dstU, uint8_t *dstV, uint8_t *src1, uint8_t *src2, int width)
{ {
int i; int i;
assert(src1 == src2); assert(src1 == src2);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment