summaryrefslogtreecommitdiffstats
path: root/libswscale/swscale.c
diff options
context:
space:
mode:
authorlucabe <lucabe@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-12 15:40:08 +0000
committerlucabe <lucabe@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-12 15:40:08 +0000
commit86bfe9c6b8bc32ac48ef6c498e38e27857fc8eb6 (patch)
treec3edd350b9b4e40f7a7617699f9af0259ccc1861 /libswscale/swscale.c
parent2cbddd1672b80a56efa91729f924577d65635488 (diff)
downloadmpv-86bfe9c6b8bc32ac48ef6c498e38e27857fc8eb6.tar.bz2
mpv-86bfe9c6b8bc32ac48ef6c498e38e27857fc8eb6.tar.xz
Add "support for both orderings of the slices (top->down / bottom->up)"
(r15249) to sws_scale() too (until now, it only was in sws_scale_ordered()) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21887 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libswscale/swscale.c')
-rw-r--r--libswscale/swscale.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 902edc3daf..e8f18ebee5 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -2414,7 +2414,7 @@ SwsContext *sws_getContext(int srcW, int srcH, int srcFormat, int dstW, int dstH
* swscale warper, so we don't need to export the SwsContext.
* assumes planar YUV to be in YUV order instead of YVU
*/
-int sws_scale_ordered(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
+int sws_scale(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dst[], int dstStride[]){
if (c->sliceDir == 0 && srcSliceY != 0 && srcSliceY + srcSliceH != c->srcH) {
MSG_ERR("swScaler: slices start in the middle!\n");
@@ -2449,15 +2449,9 @@ int sws_scale_ordered(SwsContext *c, uint8_t* src[], int srcStride[], int srcSli
/**
* swscale warper, so we don't need to export the SwsContext
*/
-int sws_scale(SwsContext *c, uint8_t* srcParam[], int srcStride[], int srcSliceY,
- int srcSliceH, uint8_t* dstParam[], int dstStride[]){
- uint8_t *src[3];
- uint8_t *dst[3];
- src[0] = srcParam[0]; src[1] = srcParam[1]; src[2] = srcParam[2];
- dst[0] = dstParam[0]; dst[1] = dstParam[1]; dst[2] = dstParam[2];
-//printf("sws: slice %d %d\n", srcSliceY, srcSliceH);
-
- return c->swScale(c, src, srcStride, srcSliceY, srcSliceH, dst, dstStride);
+int sws_scale_ordered(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
+ int srcSliceH, uint8_t* dst[], int dstStride[]){
+ return sws_scale(c, src, srcStride, srcSliceY, srcSliceH, dst, dstStride);
}
SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur,