summaryrefslogtreecommitdiffstats
path: root/postproc/yuv2rgb_template.c
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-02-23 22:05:55 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-02-23 22:05:55 +0000
commit41b847f6a8af2013338a63c1b7311f804b2bf5b7 (patch)
treed4dfb5b969edcaf963f4ca68030a3e16650b2589 /postproc/yuv2rgb_template.c
parent4bd87c35eb568740b2ae8e6c636d4e63622aa067 (diff)
downloadmpv-41b847f6a8af2013338a63c1b7311f804b2bf5b7.tar.bz2
mpv-41b847f6a8af2013338a63c1b7311f804b2bf5b7.tar.xz
sws_ prefix, more seperation between internal & external swscaler API
sws_scale() returns the number of outputed lines git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9495 b3059339-0415-0410-9bf9-f77b7e298cf2
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;
}