summaryrefslogtreecommitdiff
path: root/src/xine-utils
diff options
context:
space:
mode:
authorJames Stembridge <jstembridge@users.sourceforge.net>2005-01-23 23:01:12 +0000
committerJames Stembridge <jstembridge@users.sourceforge.net>2005-01-23 23:01:12 +0000
commit17603c0abb5b89f0aab6929d9dde4af44e4ef809 (patch)
tree4da848b4b6061b6b92463ce1194af7196c47e5a0 /src/xine-utils
parentb9652d9d8ca12f87d62ea9fe0905025b655a9951 (diff)
downloadxine-lib-17603c0abb5b89f0aab6929d9dde4af44e4ef809.tar.gz
xine-lib-17603c0abb5b89f0aab6929d9dde4af44e4ef809.tar.bz2
**BUGFIX**
Fix cropping and zooming CVS patchset: 7367 CVS date: 2005/01/23 23:01:12
Diffstat (limited to 'src/xine-utils')
-rw-r--r--src/xine-utils/color.c29
1 files changed, 16 insertions, 13 deletions
diff --git a/src/xine-utils/color.c b/src/xine-utils/color.c
index a300eb109..d01e8b649 100644
--- a/src/xine-utils/color.c
+++ b/src/xine-utils/color.c
@@ -61,7 +61,7 @@
* instructions), these macros will automatically map to those special
* instructions.
*
- * $Id: color.c,v 1.24 2003/12/09 00:02:38 f1rmb Exp $
+ * $Id: color.c,v 1.25 2005/01/23 23:01:13 jstembridge Exp $
*/
#include "xine_internal.h"
@@ -701,12 +701,9 @@ static void yv12_to_yuy2_c
p_y1 = p_y2;
p_y2 += y_src_pitch;
- for( i_x = width / 8 ; i_x-- ; )
+ for( i_x = width / 2 ; i_x-- ; )
{
C_YUV420_YUYV( );
- C_YUV420_YUYV( );
- C_YUV420_YUYV( );
- C_YUV420_YUYV( );
}
p_y2 += i_source_margin;
@@ -734,12 +731,9 @@ static void yv12_to_yuy2_c
p_y1 = p_y2;
p_y2 += 2 * y_src_pitch;
- for( i_x = width / 8 ; i_x-- ; )
+ for( i_x = width / 2 ; i_x-- ; )
{
C_YUV420_YUYV( );
- C_YUV420_YUYV( );
- C_YUV420_YUYV( );
- C_YUV420_YUYV( );
}
p_y2 += i_source_margin + y_src_pitch;
@@ -770,12 +764,9 @@ static void yv12_to_yuy2_c
p_y1 = p_y2;
p_y2 += 2 * y_src_pitch;
- for( i_x = width / 8 ; i_x-- ; )
+ for( i_x = width / 2 ; i_x-- ; )
{
C_YUV420_YUYV( );
- C_YUV420_YUYV( );
- C_YUV420_YUYV( );
- C_YUV420_YUYV( );
}
p_y2 += i_source_margin + y_src_pitch;
@@ -868,6 +859,10 @@ static void yv12_to_yuy2_mmxext
{
MMXEXT_YUV420_YUYV( );
}
+ for( i_x = (width % 8) / 2 ; i_x-- ; )
+ {
+ C_YUV420_YUYV( );
+ }
p_y2 += i_source_margin;
p_u += i_source_u_margin;
@@ -898,6 +893,10 @@ static void yv12_to_yuy2_mmxext
{
MMXEXT_YUV420_YUYV( );
}
+ for( i_x = (width % 8) / 2 ; i_x-- ; )
+ {
+ C_YUV420_YUYV( );
+ }
p_y2 += i_source_margin + y_src_pitch;
p_u += i_source_u_margin + u_src_pitch;
@@ -931,6 +930,10 @@ static void yv12_to_yuy2_mmxext
{
MMXEXT_YUV420_YUYV( );
}
+ for( i_x = (width % 8) / 2 ; i_x-- ; )
+ {
+ C_YUV420_YUYV( );
+ }
p_y2 += i_source_margin + y_src_pitch;
p_u += i_source_u_margin + u_src_pitch;