--- image.h	2003/01/25 22:51:20	1.8.2.10
+++ image.h	2010/11/28 15:18:21	1.18
@@ -1,3 +1,28 @@
+/*****************************************************************************
+ *
+ *  XVID MPEG-4 VIDEO CODEC
+ *  - Image related header  -
+ *
+ *  Copyright(C) 2001-2010 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
+ *  the Free Software Foundation ; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY ; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  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.18 2010/11/28 15:18:21 Isibaar Exp $
+ *
+ ****************************************************************************/
+
 #ifndef _IMAGE_H_
 #define _IMAGE_H_
 
@@ -28,22 +53,23 @@
 
 void image_swap(IMAGE * image1,
 				IMAGE * image2);
-				
+
 void image_copy(IMAGE * image1,
 				IMAGE * image2,
 				uint32_t edged_width,
 				uint32_t height);
-				
+
 void image_setedges(IMAGE * image,
 					uint32_t edged_width,
 					uint32_t edged_height,
 					uint32_t width,
-					uint32_t height);
-					
-void image_interpolate(const IMAGE * refn,
-					   IMAGE * refh,
-					   IMAGE * refv,
-					   IMAGE * refhv,
+					uint32_t height,
+					int bs_version);
+
+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,
@@ -72,8 +98,8 @@
 				uint32_t width,
 				int height,
 				uint32_t edged_width,
-				uint8_t * src,
-				int src_stride,
+				uint8_t * src[4],
+				int src_stride[4],
 				int csp,
 				int interlaced);
 
@@ -81,8 +107,8 @@
 				 uint32_t width,
 				 int height,
 				 uint32_t edged_width,
-				 uint8_t * dst,
-				 uint32_t dst_stride,
+				 uint8_t * dst[4],
+				 int dst_stride[4],
 				 int csp,
 				 int interlaced);
 
@@ -101,7 +127,7 @@
 				uint32_t height);
 
 void
-output_slice(IMAGE * cur, int edged_width, int width, XVID_DEC_PICTURE* 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
@@ -109,10 +135,19 @@
 					int y, int u, int v);
 
 
+void image_block_variance(IMAGE * orig_image, uint16_t stride, MACROBLOCK *mbs,
+				          uint16_t mb_width, uint16_t mb_height);
+
 void
-image_deblock_rrv(IMAGE * img, int edgeg_width,
+image_deblock_rrv(IMAGE * img, int edged_width,
 				const MACROBLOCK * mbs, int mb_width, int mb_height, int mb_stride,
 				int block, int flags);
 
 
+	/* helper function: deinterlace image.
+	 Only for YUV 4:2:0 planar format. Use bottom_first!=0 if main
+	 field is the bottom one.
+	 returns 1 if everything went ok, 0 otherwise. */
+extern int xvid_image_deinterlace(xvid_image_t* img, int width, int height, int bottom_first);
+
 #endif							/* _IMAGE_H_ */