move all the functions to the _c suffix
---
libswscale/swscale_template.c | 130 ++++++++++++++++++++--------------------
1 files changed, 65 insertions(+), 65 deletions(-)
diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c
index c983fc0..cac9725 100644
--- a/libswscale/swscale_template.c
+++ b/libswscale/swscale_template.c
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-static inline void RENAME(yuv2yuvX)(SwsContext *c, const int16_t *lumFilter,
const int16_t **lumSrc, int lumFilterSize,
+static inline void yuv2yuvX_c(SwsContext *c, const int16_t *lumFilter, const
int16_t **lumSrc, int lumFilterSize,
const int16_t *chrFilter, const int16_t
**chrSrc, int chrFilterSize, const int16_t **alpSrc,
uint8_t *dest, uint8_t *uDest, uint8_t
*vDest, uint8_t *aDest, long dstW, long chrDstW)
{
@@ -27,7 +27,7 @@ static inline void RENAME(yuv2yuvX)(SwsContext *c, const
int16_t *lumFilter, con
alpSrc, dest, uDest, vDest, aDest, dstW, chrDstW);
}
-static inline void RENAME(yuv2nv12X)(SwsContext *c, const int16_t *lumFilter,
const int16_t **lumSrc, int lumFilterSize,
+static inline void yuv2nv12X_c(SwsContext *c, const int16_t *lumFilter, const
int16_t **lumSrc, int lumFilterSize,
const int16_t *chrFilter, const int16_t
**chrSrc, int chrFilterSize,
uint8_t *dest, uint8_t *uDest, int dstW,
int chrDstW, enum PixelFormat dstFormat)
{
@@ -36,7 +36,7 @@ static inline void RENAME(yuv2nv12X)(SwsContext *c, const
int16_t *lumFilter, co
dest, uDest, dstW, chrDstW, dstFormat);
}
-static inline void RENAME(yuv2yuv1)(SwsContext *c, const int16_t *lumSrc,
const int16_t *chrSrc, const int16_t *alpSrc,
+static inline void yuv2yuv1_c(SwsContext *c, const int16_t *lumSrc, const
int16_t *chrSrc, const int16_t *alpSrc,
uint8_t *dest, uint8_t *uDest, uint8_t
*vDest, uint8_t *aDest, long dstW, long chrDstW)
{
int i;
@@ -78,7 +78,7 @@ static inline void RENAME(yuv2yuv1)(SwsContext *c, const
int16_t *lumSrc, const
/**
* vertical scale YV12 to RGB
*/
-static inline void RENAME(yuv2packedX)(SwsContext *c, const int16_t
*lumFilter, const int16_t **lumSrc, int lumFilterSize,
+static inline void yuv2packedX_c(SwsContext *c, const int16_t *lumFilter,
const int16_t **lumSrc, int lumFilterSize,
const int16_t *chrFilter, const int16_t
**chrSrc, int chrFilterSize,
const int16_t **alpSrc, uint8_t *dest,
long dstW, long dstY)
{
@@ -90,7 +90,7 @@ static inline void RENAME(yuv2packedX)(SwsContext *c, const
int16_t *lumFilter,
/**
* vertical bilinear scale YV12 to RGB
*/
-static inline void RENAME(yuv2packed2)(SwsContext *c, const uint16_t *buf0,
const uint16_t *buf1, const uint16_t *uvbuf0, const uint16_t *uvbuf1,
+static inline void yuv2packed2_c(SwsContext *c, const uint16_t *buf0, const
uint16_t *buf1, const uint16_t *uvbuf0, const uint16_t *uvbuf1,
const uint16_t *abuf0, const uint16_t *abuf1,
uint8_t *dest, int dstW, int yalpha, int uvalpha, int y)
{
int yalpha1=4095- yalpha;
@@ -103,7 +103,7 @@ static inline void RENAME(yuv2packed2)(SwsContext *c, const
uint16_t *buf0, cons
/**
* YV12 to RGB without scaling or interpolating
*/
-static inline void RENAME(yuv2packed1)(SwsContext *c, const uint16_t *buf0,
const uint16_t *uvbuf0, const uint16_t *uvbuf1,
+static inline void yuv2packed1_c(SwsContext *c, const uint16_t *buf0, const
uint16_t *uvbuf0, const uint16_t *uvbuf1,
const uint16_t *abuf0, uint8_t *dest, int dstW, int
uvalpha, enum PixelFormat dstFormat, int flags, int y)
{
const int yalpha1=0;
@@ -126,14 +126,14 @@ static inline void RENAME(yuv2packed1)(SwsContext *c,
const uint16_t *buf0, cons
//FIXME yuy2* can read up to 7 samples too much
-static inline void RENAME(yuy2ToY)(uint8_t *dst, const uint8_t *src, long
width, uint32_t *unused)
+static inline void yuy2ToY_c(uint8_t *dst, const uint8_t *src, long width,
uint32_t *unused)
{
int i;
for (i=0; i<width; i++)
dst[i]= src[2*i];
}
-static inline void RENAME(yuy2ToUV)(uint8_t *dstU, uint8_t *dstV, const
uint8_t *src1, const uint8_t *src2, long width, uint32_t *unused)
+static inline void yuy2ToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t
*src1, const uint8_t *src2, long width, uint32_t *unused)
{
int i;
for (i=0; i<width; i++) {
@@ -143,7 +143,7 @@ static inline void RENAME(yuy2ToUV)(uint8_t *dstU, uint8_t
*dstV, const uint8_t
assert(src1 == src2);
}
-static inline void RENAME(LEToUV)(uint8_t *dstU, uint8_t *dstV, const uint8_t
*src1, const uint8_t *src2, long width, uint32_t *unused)
+static inline void LEToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1,
const uint8_t *src2, long width, uint32_t *unused)
{
int i;
for (i=0; i<width; i++) {
@@ -154,14 +154,14 @@ static inline void RENAME(LEToUV)(uint8_t *dstU, uint8_t
*dstV, const uint8_t *s
/* This is almost identical to the previous, end exists only because
* yuy2ToY/UV)(dst, src+1, ...) would have 100% unaligned accesses. */
-static inline void RENAME(uyvyToY)(uint8_t *dst, const uint8_t *src, long
width, uint32_t *unused)
+static inline void uyvyToY_c(uint8_t *dst, const uint8_t *src, long width,
uint32_t *unused)
{
int i;
for (i=0; i<width; i++)
dst[i]= src[2*i+1];
}
-static inline void RENAME(uyvyToUV)(uint8_t *dstU, uint8_t *dstV, const
uint8_t *src1, const uint8_t *src2, long width, uint32_t *unused)
+static inline void uyvyToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t
*src1, const uint8_t *src2, long width, uint32_t *unused)
{
int i;
for (i=0; i<width; i++) {
@@ -171,7 +171,7 @@ static inline void RENAME(uyvyToUV)(uint8_t *dstU, uint8_t
*dstV, const uint8_t
assert(src1 == src2);
}
-static inline void RENAME(BEToUV)(uint8_t *dstU, uint8_t *dstV, const uint8_t
*src1, const uint8_t *src2, long width, uint32_t *unused)
+static inline void BEToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t *src1,
const uint8_t *src2, long width, uint32_t *unused)
{
int i;
for (i=0; i<width; i++) {
@@ -180,7 +180,7 @@ static inline void RENAME(BEToUV)(uint8_t *dstU, uint8_t
*dstV, const uint8_t *s
}
}
-static inline void RENAME(nvXXtoUV)(uint8_t *dst1, uint8_t *dst2,
+static inline void nvXXtoUV_c(uint8_t *dst1, uint8_t *dst2,
const uint8_t *src, long width)
{
int i;
@@ -190,21 +190,21 @@ static inline void RENAME(nvXXtoUV)(uint8_t *dst1,
uint8_t *dst2,
}
}
-static inline void RENAME(nv12ToUV)(uint8_t *dstU, uint8_t *dstV,
+static inline void nv12ToUV_c(uint8_t *dstU, uint8_t *dstV,
const uint8_t *src1, const uint8_t *src2,
long width, uint32_t *unused)
{
- RENAME(nvXXtoUV)(dstU, dstV, src1, width);
+ nvXXtoUV_c(dstU, dstV, src1, width);
}
-static inline void RENAME(nv21ToUV)(uint8_t *dstU, uint8_t *dstV,
+static inline void nv21ToUV_c(uint8_t *dstU, uint8_t *dstV,
const uint8_t *src1, const uint8_t *src2,
long width, uint32_t *unused)
{
- RENAME(nvXXtoUV)(dstV, dstU, src1, width);
+ nvXXtoUV_c(dstV, dstU, src1, width);
}
-static inline void RENAME(bgr24ToY)(uint8_t *dst, const uint8_t *src, long
width, uint32_t *unused)
+static inline void bgr24ToY_c(uint8_t *dst, const uint8_t *src, long width,
uint32_t *unused)
{
int i;
for (i=0; i<width; i++) {
@@ -216,7 +216,7 @@ static inline void RENAME(bgr24ToY)(uint8_t *dst, const
uint8_t *src, long width
}
}
-static inline void RENAME(bgr24ToUV)(uint8_t *dstU, uint8_t *dstV, const
uint8_t *src1, const uint8_t *src2, long width, uint32_t *unused)
+static inline void bgr24ToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t
*src1, const uint8_t *src2, long width, uint32_t *unused)
{
int i;
for (i=0; i<width; i++) {
@@ -230,7 +230,7 @@ static inline void RENAME(bgr24ToUV)(uint8_t *dstU, uint8_t
*dstV, const uint8_t
assert(src1 == src2);
}
-static inline void RENAME(bgr24ToUV_half)(uint8_t *dstU, uint8_t *dstV, const
uint8_t *src1, const uint8_t *src2, long width, uint32_t *unused)
+static inline void bgr24ToUV_half_c(uint8_t *dstU, uint8_t *dstV, const
uint8_t *src1, const uint8_t *src2, long width, uint32_t *unused)
{
int i;
for (i=0; i<width; i++) {
@@ -244,7 +244,7 @@ static inline void RENAME(bgr24ToUV_half)(uint8_t *dstU,
uint8_t *dstV, const ui
assert(src1 == src2);
}
-static inline void RENAME(rgb24ToY)(uint8_t *dst, const uint8_t *src, long
width, uint32_t *unused)
+static inline void rgb24ToY_c(uint8_t *dst, const uint8_t *src, long width,
uint32_t *unused)
{
int i;
for (i=0; i<width; i++) {
@@ -256,7 +256,7 @@ static inline void RENAME(rgb24ToY)(uint8_t *dst, const
uint8_t *src, long width
}
}
-static inline void RENAME(rgb24ToUV)(uint8_t *dstU, uint8_t *dstV, const
uint8_t *src1, const uint8_t *src2, long width, uint32_t *unused)
+static inline void rgb24ToUV_c(uint8_t *dstU, uint8_t *dstV, const uint8_t
*src1, const uint8_t *src2, long width, uint32_t *unused)
{
int i;
assert(src1==src2);
@@ -270,7 +270,7 @@ static inline void RENAME(rgb24ToUV)(uint8_t *dstU, uint8_t
*dstV, const uint8_t
}
}
-static inline void RENAME(rgb24ToUV_half)(uint8_t *dstU, uint8_t *dstV, const
uint8_t *src1, const uint8_t *src2, long width, uint32_t *unused)
+static inline void rgb24ToUV_half_c(uint8_t *dstU, uint8_t *dstV, const
uint8_t *src1, const uint8_t *src2, long width, uint32_t *unused)
{
int i;
assert(src1==src2);
@@ -286,7 +286,7 @@ static inline void RENAME(rgb24ToUV_half)(uint8_t *dstU,
uint8_t *dstV, const ui
// bilinear / bicubic scaling
-static inline void RENAME(hScale)(int16_t *dst, int dstW, const uint8_t *src,
int srcW, int xInc,
+static inline void hScale_c(int16_t *dst, int dstW, const uint8_t *src, int
srcW, int xInc,
const int16_t *filter, const int16_t
*filterPos, long filterSize)
{
int i;
@@ -307,7 +307,7 @@ static inline void RENAME(hScale)(int16_t *dst, int dstW,
const uint8_t *src, in
//FIXME all pal and rgb srcFormats could do this convertion as well
//FIXME all scalers more complex than bilinear could do half of this transform
-static void RENAME(chrRangeToJpeg)(uint16_t *dst, int width)
+static void chrRangeToJpeg_c(uint16_t *dst, int width)
{
int i;
for (i = 0; i < width; i++) {
@@ -315,7 +315,7 @@ static void RENAME(chrRangeToJpeg)(uint16_t *dst, int width)
dst[i+VOFW] = (FFMIN(dst[i+VOFW],30775)*4663 - 9289992)>>12; //-264
}
}
-static void RENAME(chrRangeFromJpeg)(uint16_t *dst, int width)
+static void chrRangeFromJpeg_c(uint16_t *dst, int width)
{
int i;
for (i = 0; i < width; i++) {
@@ -323,20 +323,20 @@ static void RENAME(chrRangeFromJpeg)(uint16_t *dst, int
width)
dst[i+VOFW] = (dst[i+VOFW]*1799 + 4081085)>>11; //1469
}
}
-static void RENAME(lumRangeToJpeg)(uint16_t *dst, int width)
+static void lumRangeToJpeg_c(uint16_t *dst, int width)
{
int i;
for (i = 0; i < width; i++)
dst[i] = (FFMIN(dst[i],30189)*19077 - 39057361)>>14;
}
-static void RENAME(lumRangeFromJpeg)(uint16_t *dst, int width)
+static void lumRangeFromJpeg_c(uint16_t *dst, int width)
{
int i;
for (i = 0; i < width; i++)
dst[i] = (dst[i]*14071 + 33561947)>>14;
}
-static inline void RENAME(hyscale_fast)(SwsContext *c, int16_t *dst,
+static inline void hyscale_fast_c(SwsContext *c, int16_t *dst,
long dstWidth, const uint8_t *src, int
srcW,
int xInc)
{
@@ -351,7 +351,7 @@ static inline void RENAME(hyscale_fast)(SwsContext *c,
int16_t *dst,
}
// *** horizontal scale Y line to temp buffer
-static inline void RENAME(hyscale)(SwsContext *c, uint16_t *dst, long
dstWidth, const uint8_t *src, int srcW, int xInc,
+static inline void hyscale_c(SwsContext *c, uint16_t *dst, long dstWidth,
const uint8_t *src, int srcW, int xInc,
const int16_t *hLumFilter,
const int16_t *hLumFilterPos, int
hLumFilterSize,
uint8_t *formatConvBuffer,
@@ -377,7 +377,7 @@ static inline void RENAME(hyscale)(SwsContext *c, uint16_t
*dst, long dstWidth,
convertRange(dst, dstWidth);
}
-static inline void RENAME(hcscale_fast)(SwsContext *c, int16_t *dst,
+static inline void hcscale_fast_c(SwsContext *c, int16_t *dst,
long dstWidth, const uint8_t *src1,
const uint8_t *src2, int srcW, int
xInc)
{
@@ -396,7 +396,7 @@ static inline void RENAME(hcscale_fast)(SwsContext *c,
int16_t *dst,
}
}
-inline static void RENAME(hcscale)(SwsContext *c, uint16_t *dst, long
dstWidth, const uint8_t *src1, const uint8_t *src2,
+inline static void hcscale_c(SwsContext *c, uint16_t *dst, long dstWidth,
const uint8_t *src1, const uint8_t *src2,
int srcW, int xInc, const int16_t
*hChrFilter,
const int16_t *hChrFilterPos, int
hChrFilterSize,
uint8_t *formatConvBuffer,
@@ -426,7 +426,7 @@ inline static void RENAME(hcscale)(SwsContext *c, uint16_t
*dst, long dstWidth,
#define DEBUG_SWSCALE_BUFFERS 0
#define DEBUG_BUFFERS(...) if (DEBUG_SWSCALE_BUFFERS) av_log(c, AV_LOG_DEBUG,
__VA_ARGS__)
-static int RENAME(swScale)(SwsContext *c, const uint8_t* src[], int
srcStride[], int srcSliceY,
+static int swScale_c(SwsContext *c, const uint8_t* src[], int srcStride[], int
srcSliceY,
int srcSliceH, uint8_t* dst[], int dstStride[])
{
/* load a few things into local vars to make the code more readable? and
faster */
@@ -560,12 +560,12 @@ static int RENAME(swScale)(SwsContext *c, const uint8_t*
src[], int srcStride[],
assert(lumBufIndex < 2*vLumBufSize);
assert(lastInLumBuf + 1 - srcSliceY < srcSliceH);
assert(lastInLumBuf + 1 - srcSliceY >= 0);
- RENAME(hyscale)(c, lumPixBuf[ lumBufIndex ], dstW, src1, srcW,
lumXInc,
+ hyscale_c(c, lumPixBuf[ lumBufIndex ], dstW, src1, srcW, lumXInc,
hLumFilter, hLumFilterPos, hLumFilterSize,
formatConvBuffer,
pal, 0);
if (CONFIG_SWSCALE_ALPHA && alpPixBuf)
- RENAME(hyscale)(c, alpPixBuf[ lumBufIndex ], dstW, src2, srcW,
lumXInc,
+ hyscale_c(c, alpPixBuf[ lumBufIndex ], dstW, src2, srcW,
lumXInc,
hLumFilter, hLumFilterPos, hLumFilterSize,
formatConvBuffer,
pal, 1);
@@ -583,7 +583,7 @@ static int RENAME(swScale)(SwsContext *c, const uint8_t*
src[], int srcStride[],
//FIXME replace parameters through context struct (some at least)
if (c->needs_hcscale)
- RENAME(hcscale)(c, chrPixBuf[ chrBufIndex ], chrDstW, src1,
src2, chrSrcW, chrXInc,
+ hcscale_c(c, chrPixBuf[ chrBufIndex ], chrDstW, src1, src2,
chrSrcW, chrXInc,
hChrFilter, hChrFilterPos, hChrFilterSize,
formatConvBuffer,
pal);
@@ -731,31 +731,31 @@ static int RENAME(swScale)(SwsContext *c, const uint8_t*
src[], int srcStride[],
return dstY - lastDstY;
}
-static void RENAME(sws_init_swScale)(SwsContext *c)
+static void sws_init_swScale_c(SwsContext *c)
{
enum PixelFormat srcFormat = c->srcFormat;
- c->yuv2nv12X = RENAME(yuv2nv12X );
- c->yuv2yuv1 = RENAME(yuv2yuv1 );
- c->yuv2yuvX = RENAME(yuv2yuvX );
- c->yuv2packed1 = RENAME(yuv2packed1 );
- c->yuv2packed2 = RENAME(yuv2packed2 );
- c->yuv2packedX = RENAME(yuv2packedX );
+ c->yuv2nv12X = yuv2nv12X_c;
+ c->yuv2yuv1 = yuv2yuv1_c;
+ c->yuv2yuvX = yuv2yuvX_c;
+ c->yuv2packed1 = yuv2packed1_c;
+ c->yuv2packed2 = yuv2packed2_c;
+ c->yuv2packedX = yuv2packedX_c;
- c->hScale = RENAME(hScale );
+ c->hScale = hScale_c;
if (c->flags & SWS_FAST_BILINEAR)
{
- c->hyscale_fast = RENAME(hyscale_fast);
- c->hcscale_fast = RENAME(hcscale_fast);
+ c->hyscale_fast = hyscale_fast_c;
+ c->hcscale_fast = hcscale_fast_c;
}
c->chrToYV12 = NULL;
switch(srcFormat) {
- case PIX_FMT_YUYV422 : c->chrToYV12 = RENAME(yuy2ToUV); break;
- case PIX_FMT_UYVY422 : c->chrToYV12 = RENAME(uyvyToUV); break;
- case PIX_FMT_NV12 : c->chrToYV12 = RENAME(nv12ToUV); break;
- case PIX_FMT_NV21 : c->chrToYV12 = RENAME(nv21ToUV); break;
+ case PIX_FMT_YUYV422 : c->chrToYV12 = yuy2ToUV_c; break;
+ case PIX_FMT_UYVY422 : c->chrToYV12 = uyvyToUV_c; break;
+ case PIX_FMT_NV12 : c->chrToYV12 = nv12ToUV_c; break;
+ case PIX_FMT_NV21 : c->chrToYV12 = nv21ToUV_c; break;
case PIX_FMT_RGB8 :
case PIX_FMT_BGR8 :
case PIX_FMT_PAL8 :
@@ -763,10 +763,10 @@ static void RENAME(sws_init_swScale)(SwsContext *c)
case PIX_FMT_RGB4_BYTE: c->chrToYV12 = palToUV; break;
case PIX_FMT_YUV420P16BE:
case PIX_FMT_YUV422P16BE:
- case PIX_FMT_YUV444P16BE: c->chrToYV12 = RENAME(BEToUV); break;
+ case PIX_FMT_YUV444P16BE: c->chrToYV12 = BEToUV_c; break;
case PIX_FMT_YUV420P16LE:
case PIX_FMT_YUV422P16LE:
- case PIX_FMT_YUV444P16LE: c->chrToYV12 = RENAME(LEToUV); break;
+ case PIX_FMT_YUV444P16LE: c->chrToYV12 = LEToUV_c; break;
}
if (c->chrSrcHSubSample) {
switch(srcFormat) {
@@ -774,12 +774,12 @@ static void RENAME(sws_init_swScale)(SwsContext *c)
case PIX_FMT_RGB48LE: c->chrToYV12 = rgb48ToUV_half; break;
case PIX_FMT_RGB32 : c->chrToYV12 = bgr32ToUV_half; break;
case PIX_FMT_RGB32_1: c->chrToYV12 = bgr321ToUV_half; break;
- case PIX_FMT_BGR24 : c->chrToYV12 = RENAME(bgr24ToUV_half); break;
+ case PIX_FMT_BGR24 : c->chrToYV12 = bgr24ToUV_half_c; break;
case PIX_FMT_BGR565 : c->chrToYV12 = bgr16ToUV_half; break;
case PIX_FMT_BGR555 : c->chrToYV12 = bgr15ToUV_half; break;
case PIX_FMT_BGR32 : c->chrToYV12 = rgb32ToUV_half; break;
case PIX_FMT_BGR32_1: c->chrToYV12 = rgb321ToUV_half; break;
- case PIX_FMT_RGB24 : c->chrToYV12 = RENAME(rgb24ToUV_half); break;
+ case PIX_FMT_RGB24 : c->chrToYV12 = rgb24ToUV_half_c; break;
case PIX_FMT_RGB565 : c->chrToYV12 = rgb16ToUV_half; break;
case PIX_FMT_RGB555 : c->chrToYV12 = rgb15ToUV_half; break;
}
@@ -789,12 +789,12 @@ static void RENAME(sws_init_swScale)(SwsContext *c)
case PIX_FMT_RGB48LE: c->chrToYV12 = rgb48ToUV; break;
case PIX_FMT_RGB32 : c->chrToYV12 = bgr32ToUV; break;
case PIX_FMT_RGB32_1: c->chrToYV12 = bgr321ToUV; break;
- case PIX_FMT_BGR24 : c->chrToYV12 = RENAME(bgr24ToUV); break;
+ case PIX_FMT_BGR24 : c->chrToYV12 = bgr24ToUV_c; break;
case PIX_FMT_BGR565 : c->chrToYV12 = bgr16ToUV; break;
case PIX_FMT_BGR555 : c->chrToYV12 = bgr15ToUV; break;
case PIX_FMT_BGR32 : c->chrToYV12 = rgb32ToUV; break;
case PIX_FMT_BGR32_1: c->chrToYV12 = rgb321ToUV; break;
- case PIX_FMT_RGB24 : c->chrToYV12 = RENAME(rgb24ToUV); break;
+ case PIX_FMT_RGB24 : c->chrToYV12 = rgb24ToUV_c; break;
case PIX_FMT_RGB565 : c->chrToYV12 = rgb16ToUV; break;
case PIX_FMT_RGB555 : c->chrToYV12 = rgb15ToUV; break;
}
@@ -808,16 +808,16 @@ static void RENAME(sws_init_swScale)(SwsContext *c)
case PIX_FMT_YUV422P16BE:
case PIX_FMT_YUV444P16BE:
case PIX_FMT_Y400A :
- case PIX_FMT_GRAY16BE : c->lumToYV12 = RENAME(yuy2ToY); break;
+ case PIX_FMT_GRAY16BE : c->lumToYV12 = yuy2ToY_c; break;
case PIX_FMT_UYVY422 :
case PIX_FMT_YUV420P16LE:
case PIX_FMT_YUV422P16LE:
case PIX_FMT_YUV444P16LE:
- case PIX_FMT_GRAY16LE : c->lumToYV12 = RENAME(uyvyToY); break;
- case PIX_FMT_BGR24 : c->lumToYV12 = RENAME(bgr24ToY); break;
+ case PIX_FMT_GRAY16LE : c->lumToYV12 = uyvyToY_c; break;
+ case PIX_FMT_BGR24 : c->lumToYV12 = bgr24ToY_c; break;
case PIX_FMT_BGR565 : c->lumToYV12 = bgr16ToY; break;
case PIX_FMT_BGR555 : c->lumToYV12 = bgr15ToY; break;
- case PIX_FMT_RGB24 : c->lumToYV12 = RENAME(rgb24ToY); break;
+ case PIX_FMT_RGB24 : c->lumToYV12 = rgb24ToY_c; break;
case PIX_FMT_RGB565 : c->lumToYV12 = rgb16ToY; break;
case PIX_FMT_RGB555 : c->lumToYV12 = rgb15ToY; break;
case PIX_FMT_RGB8 :
@@ -840,7 +840,7 @@ static void RENAME(sws_init_swScale)(SwsContext *c)
case PIX_FMT_RGB32_1:
case PIX_FMT_BGR32 :
case PIX_FMT_BGR32_1: c->alpToYV12 = abgrToA; break;
- case PIX_FMT_Y400A : c->alpToYV12 = RENAME(yuy2ToY); break;
+ case PIX_FMT_Y400A : c->alpToYV12 = yuy2ToY_c; break;
}
}
@@ -861,11 +861,11 @@ static void RENAME(sws_init_swScale)(SwsContext *c)
if (c->srcRange != c->dstRange && !isAnyRGB(c->dstFormat)) {
if (c->srcRange) {
- c->lumConvertRange = RENAME(lumRangeFromJpeg);
- c->chrConvertRange = RENAME(chrRangeFromJpeg);
+ c->lumConvertRange = lumRangeFromJpeg_c;
+ c->chrConvertRange = chrRangeFromJpeg_c;
} else {
- c->lumConvertRange = RENAME(lumRangeToJpeg);
- c->chrConvertRange = RENAME(chrRangeToJpeg);
+ c->lumConvertRange = lumRangeToJpeg_c;
+ c->chrConvertRange = chrRangeToJpeg_c;
}
}
--
1.7.4.1
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
