Revert "Fix a stride and chroma-alignment bug in imageconvert rgb->yuv."

This reverts commit b079b71544682dca4e4efb5454b5b01e7f395bd8.

diff --git a/src/modules/core/filter_imageconvert.c b/src/modules/core/filter_imageconvert.c
index 19342114c2105124094aed9c7338d12f54118c9d..99378604b1658a062a915bc7d81476abc49f0b27 100644 (file)
--- a/src/modules/core/filter_imageconvert.c
+++ b/src/modules/core/filter_imageconvert.c
@@ -160,8 +160,6 @@ static int convert_rgb24a_to_yuv422( uint8_t *rgba, uint8_t *yuv, uint8_t *alpha
                        RGB2YUV_601( r, g, b, y0, u0 , v0 );
                        *d++ = y0;
                        *d++ = u0;
-                       *d++ = y0;
-                       *d++ = v0;
                }
        }
        else
@@ -195,8 +193,6 @@ static int convert_rgb24a_to_yuv422( uint8_t *rgba, uint8_t *yuv, uint8_t *alpha
                        RGB2YUV_601( r, g, b, y0, u0 , v0 );
                        *d++ = y0;
                        *d++ = u0;
-                       *d++ = y0;
-                       *d++ = v0;
                }
        }
 
@@ -239,8 +235,6 @@ static int convert_rgb24_to_yuv422( uint8_t *rgb, uint8_t *yuv, uint8_t *alpha,
                        RGB2YUV_601( r, g, b, y0, u0 , v0 );
                        *d++ = y0;
                        *d++ = u0;
-                       *d++ = y0;
-                       *d++ = v0;
                }
        }
        return ret;
@@ -330,9 +324,8 @@ static int convert_image( mlt_frame frame, uint8_t **buffer, mlt_image_format *f
        {
                conversion_function converter = conversion_matrix[ *format - 1 ][ requested_format - 1 ];
 
-               mlt_log_debug( NULL, "[filter imageconvert] %s -> %s @ %dx%d\n",
-                       mlt_image_format_name( *format ), mlt_image_format_name( requested_format ),
-                       width, height );
+               mlt_log_debug( NULL, "[filter imageconvert] %s -> %s\n",
+                       mlt_image_format_name( *format ), mlt_image_format_name( requested_format ) );
                if ( converter )
                {
                        int size = width * height * bpp_table[ requested_format - 1 ];