diff libmpcodecs/vf_scale.c @ 29064:67c256364220

Consistently use MP_MAX_PLANES as size for plane pointer/stride arrays in libmpcodecs. This might avoid some issues since sws_scale in some cases assumes these have at least 4 valid entries.

--- a/libmpcodecs/vf_scale.c	Sun Mar 29 14:43:11 2009 +0000
+++ b/libmpcodecs/vf_scale.c	Sun Mar 29 14:46:59 2009 +0000
@@ -319,9 +319,9 @@
 	vf->priv->w, vf->priv->h);
 }
 
-static void scale(struct SwsContext *sws1, struct SwsContext *sws2, uint8_t *src[3], int src_stride[3], int y, int h, 
-                  uint8_t *dst[3], int dst_stride[3], int interlaced){
-    uint8_t *src2[3]={src[0], src[1], src[2]};
+static void scale(struct SwsContext *sws1, struct SwsContext *sws2, uint8_t *src[MP_MAX_PLANES], int src_stride[MP_MAX_PLANES],
+                  int y, int h,  uint8_t *dst[MP_MAX_PLANES], int dst_stride[MP_MAX_PLANES], int interlaced){
+    uint8_t *src2[MP_MAX_PLANES]={src[0], src[1], src[2]};
 #ifdef WORDS_BIGENDIAN
     uint32_t pal2[256];
     if (src[1] && !src[2]){
@@ -334,9 +334,9 @@
 
     if(interlaced){
         int i;
-        uint8_t *dst2[3]={dst[0], dst[1], dst[2]};
-        int src_stride2[3]={2*src_stride[0], 2*src_stride[1], 2*src_stride[2]};
-        int dst_stride2[3]={2*dst_stride[0], 2*dst_stride[1], 2*dst_stride[2]};
+        uint8_t *dst2[MP_MAX_PLANES]={dst[0], dst[1], dst[2]};
+        int src_stride2[MP_MAX_PLANES]={2*src_stride[0], 2*src_stride[1], 2*src_stride[2]};
+        int dst_stride2[MP_MAX_PLANES]={2*dst_stride[0], 2*dst_stride[1], 2*dst_stride[2]};
 
         sws_scale_ordered(sws1, src2, src_stride2, y>>1, h>>1, dst2, dst_stride2);
         for(i=0; i<3; i++){