--- image.h	2003/10/01 23:23:01	1.11.2.3
+++ image.h	2005/12/17 12:04:52	1.16
@@ -3,7 +3,7 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Image related header  -
  *
- *  Copyright(C) 2001-2003 Peter Ross <pross@xvid.org>
+ *  Copyright(C) 2001-2004 Peter Ross <pross@xvid.org>
  *
  *  This program is free software ; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: image.h,v 1.11.2.3 2003/10/01 23:23:01 edgomez Exp $
+ * $Id: image.h,v 1.16 2005/12/17 12:04:52 syskin Exp $
  *
  ****************************************************************************/
 
@@ -63,12 +63,13 @@
 					uint32_t edged_width,
 					uint32_t edged_height,
 					uint32_t width,
-					uint32_t height);
+					uint32_t height,
+					int bs_version);
 
-void image_interpolate(const IMAGE * refn,
-					   IMAGE * refh,
-					   IMAGE * refv,
-					   IMAGE * refhv,
+void image_interpolate(const uint8_t * refn,
+					   uint8_t * refh,
+					   uint8_t * refv,
+					   uint8_t * refhv,
 					   uint32_t edged_width,
 					   uint32_t edged_height,
 					   uint32_t quarterpel,
@@ -107,7 +108,7 @@
 				 int height,
 				 uint32_t edged_width,
 				 uint8_t * dst[4],
-				 uint32_t dst_stride[4],
+				 int dst_stride[4],
 				 int csp,
 				 int interlaced);
 
@@ -126,7 +127,7 @@
 				uint32_t height);
 
 void
-output_slice(IMAGE * cur, int edged_width, int width, xvid_image_t* out_frm, int mbx, int mby,int mbl);
+output_slice(IMAGE * cur, int stride, int width, xvid_image_t* out_frm, int mbx, int mby,int mbl);
 
 
 void