*** cmodel_permutation.h.orig	2006-03-06 16:18:00.000000000 -0800
--- cmodel_permutation.h	2006-03-11 10:45:47.000000000 -0800
***************
*** 2565,2578 ****
  	}
  
  #define TRANSFER_YUV420P_OUT_HEAD \
! 	for(i = 0; i < out_h; i++) \
! 	{ \
! 		unsigned char *input_row = input_rows[row_table[i]]; \
! 		unsigned char *output_y = out_y_plane + i * total_out_w + out_x; \
! 		unsigned char *output_u = out_u_plane + i / 2 * total_out_w / 2 + out_x / 2; \
! 		unsigned char *output_v = out_v_plane + i / 2 * total_out_w / 2 + out_x / 2; \
! 		for(j = 0; j < out_w; j++) \
! 		{
  
  #define TRANSFER_YUV422P_OUT_HEAD \
  	for(i = 0; i < out_h; i++) \
--- 2565,2604 ----
  	}
  
  #define TRANSFER_YUV420P_OUT_HEAD \
!     for(i = 0; i < out_h; i++) \
!     { \
! 		extern int qt_hack_interlace; \
! 		unsigned char *input_row,*output_y,*output_u,*output_v; \
!         input_row = input_rows[row_table[i]]; \
!         output_y = out_y_plane + i * total_out_w + out_x; \
! 		if(qt_hack_interlace==1 || qt_hack_interlace==2){ \
! 			int ejo_k=i/4; ejo_k*=2; ejo_k+=i%2; \
! 	        output_u = out_u_plane + ejo_k * (total_out_w / 2) + out_x / 2; \
! 	        output_v = out_v_plane + ejo_k * (total_out_w / 2) + out_x / 2; \
! 		} else { \
! 			output_u = out_u_plane + i / 2 * total_out_w / 2 + out_x / 2; \
! 			output_v = out_v_plane + i / 2 * total_out_w / 2 + out_x / 2; \
! 		} \
!         for(j = 0; j < out_w; j++) \
!         {
! 
! #define TRANSFER_YUV420P_IN_HEAD \
!     for(i = 0; i < out_h; i++) \
!     { \
! 		extern int qt_hack_interlace; \
! 		unsigned char *output_row,*input_y,*input_u,*input_v; \
!         output_row = output_rows[i + out_y] + out_x * out_pixelsize; \
! 		input_y = in_y_plane + row_table[i] * total_in_w; \
! 		if(qt_hack_interlace==1 || qt_hack_interlace==2){ \
!         	int ejo_k=row_table[i]/4; ejo_k*=2; ejo_k+=row_table[i]%2; \
!         	input_u = in_u_plane + ejo_k * (total_in_w / 2); \
!         	input_v = in_v_plane + ejo_k * (total_in_w / 2); \
! 		} else { \
! 			input_u = in_u_plane + (row_table[i] / 2) * (total_in_w / 2); \
! 			input_v = in_v_plane + (row_table[i] / 2) * (total_in_w / 2); \
! 		} \
!         for(j = 0; j < out_w; j++) \
!         {
  
  #define TRANSFER_YUV422P_OUT_HEAD \
  	for(i = 0; i < out_h; i++) \
***************
*** 2594,2609 ****
  		for(j = 0; j < out_w; j++) \
  		{
  
- #define TRANSFER_YUV420P_IN_HEAD \
- 	for(i = 0; i < out_h; i++) \
- 	{ \
- 		unsigned char *output_row = output_rows[i + out_y] + out_x * out_pixelsize; \
- 		unsigned char *input_y = in_y_plane + row_table[i] * total_in_w; \
- 		unsigned char *input_u = in_u_plane + (row_table[i] / 2) * (total_in_w / 2); \
- 		unsigned char *input_v = in_v_plane + (row_table[i] / 2) * (total_in_w / 2); \
- 		for(j = 0; j < out_w; j++) \
- 		{
- 
  #define TRANSFER_YUV9P_IN_HEAD \
  	for(i = 0; i < out_h; i++) \
  	{ \
--- 2620,2625 ----