more sdl/consumer tuning and demo updates

[melted] / src / modules / gtk2 / filter_rescale.c

diff --git a/src/modules/gtk2/filter_rescale.c b/src/modules/gtk2/filter_rescale.c
index f4c69ac..c57e33d 100644 (file)
--- a/src/modules/gtk2/filter_rescale.c
+++ b/src/modules/gtk2/filter_rescale.c
@@ -38,6 +38,8 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
                *width = 720;
        if ( *height == 0 )
                *height = 576;
+       if ( *width < 2 || *height < 6 )
+               return 1;
 
        mlt_properties properties = mlt_frame_properties( this );
        int iwidth = *width;
@@ -91,6 +93,13 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
                        // Return the output
                        *image = output;
                }
+               else if ( *format == mlt_image_yuv422 && !strcmp( interps, "none" ) )
+               {
+                       // Do nothing
+                       *width = iwidth;
+                       *height = iheight;
+                       *image = input;
+               }
                else if ( *format == mlt_image_rgb24 || *format == mlt_image_rgb24a )
                {
                        int bpp = (*format == mlt_image_rgb24a ? 4 : 3 );
@@ -213,4 +222,3 @@ mlt_filter filter_rescale_init( char *arg )
        }
        return this;
 }
-