summaryrefslogtreecommitdiff
path: root/postproc/yuv2rgb_template.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2003-02-23 22:05:55 +0000
committerMichael Niedermayer <michaelni@gmx.at>2003-02-23 22:05:55 +0000
commitd4e242755f3a3c5c27b26b86cccd4670c4bd3b40 (patch)
treece934efe60fcfa2cdee7d925d700f11509ea5975 /postproc/yuv2rgb_template.c
parentefa04ce2967724778a10a1db0fa65fa693625557 (diff)
sws_ prefix, more seperation between internal & external swscaler API
sws_scale() returns the number of outputed lines Originally committed as revision 9495 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
Diffstat (limited to 'postproc/yuv2rgb_template.c')
-rw-r--r--postproc/yuv2rgb_template.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/postproc/yuv2rgb_template.c b/postproc/yuv2rgb_template.c
index 7b4abf6a95..57f279746c 100644
--- a/postproc/yuv2rgb_template.c
+++ b/postproc/yuv2rgb_template.c
@@ -123,7 +123,7 @@
"punpcklbw %%mm5, %%mm2;" /* G7 G6 G5 G4 G3 G2 G1 G0 */\
-static inline void RENAME(yuv420_rgb16)(SwsContext *c, uint8_t* srcParam[], int srcStrideParam[], int srcSliceY,
+static inline int RENAME(yuv420_rgb16)(SwsContext *c, uint8_t* srcParam[], int srcStrideParam[], int srcSliceY,
int srcSliceH, uint8_t* dst[], int dstStride[]){
int srcStride[3];
uint8_t *src[3];
@@ -217,9 +217,11 @@ YUV2RGB
}
__asm__ __volatile__ (EMMS);
+
+ return srcSliceH;
}
-static inline void RENAME(yuv420_rgb15)(SwsContext *c, uint8_t* srcParam[], int srcStrideParam[], int srcSliceY,
+static inline int RENAME(yuv420_rgb15)(SwsContext *c, uint8_t* srcParam[], int srcStrideParam[], int srcSliceY,
int srcSliceH, uint8_t* dst[], int dstStride[]){
int srcStride[3];
uint8_t *src[3];
@@ -308,9 +310,10 @@ YUV2RGB
}
__asm__ __volatile__ (EMMS);
+ return srcSliceH;
}
-static inline void RENAME(yuv420_rgb24)(SwsContext *c, uint8_t* srcParam[], int srcStrideParam[], int srcSliceY,
+static inline int RENAME(yuv420_rgb24)(SwsContext *c, uint8_t* srcParam[], int srcStrideParam[], int srcSliceY,
int srcSliceH, uint8_t* dst[], int dstStride[]){
int srcStride[3];
uint8_t *src[3];
@@ -456,9 +459,10 @@ YUV2RGB
}
__asm__ __volatile__ (EMMS);
+ return srcSliceH;
}
-static inline void RENAME(yuv420_rgb32)(SwsContext *c, uint8_t* srcParam[], int srcStrideParam[], int srcSliceY,
+static inline int RENAME(yuv420_rgb32)(SwsContext *c, uint8_t* srcParam[], int srcStrideParam[], int srcSliceY,
int srcSliceH, uint8_t* dst[], int dstStride[]){
int srcStride[3];
uint8_t *src[3];
@@ -544,4 +548,5 @@ YUV2RGB
}
__asm__ __volatile__ (EMMS);
+ return srcSliceH;
}