X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fpsychedelic.c;h=9bc0e0ac8084bdc64d25c450544701869f0fa7ba;hb=5b55ee1bb0a0212b967f8f4a33824ffc6b7c7f09;hp=7e7689f65af3a7b10095859f820eaa746743be11;hpb=e40d134c69b144327fd1d2001e8b85640f5c7cb9;p=vlc

diff --git a/modules/video_filter/psychedelic.c b/modules/video_filter/psychedelic.c
index 7e7689f65a..9bc0e0ac80 100644
--- a/modules/video_filter/psychedelic.c
+++ b/modules/video_filter/psychedelic.c
@@ -28,6 +28,10 @@
 
 #include <math.h>                                            /* sin(), cos() */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 
 #include "vlc_filter.h"
@@ -156,10 +160,10 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
     v = p_filter->p_sys->v;
     for( y = 0; y<p_outpic->p[U_PLANE].i_lines; y++)
     {
-        p_filter->p_libvlc->pf_memset(
+        vlc_memset(
                 p_outpic->p[U_PLANE].p_pixels+y*p_outpic->p[U_PLANE].i_pitch,
                 u, p_outpic->p[U_PLANE].i_pitch );
-        p_filter->p_libvlc->pf_memset(
+        vlc_memset(
                 p_outpic->p[V_PLANE].p_pixels+y*p_outpic->p[V_PLANE].i_pitch,
                 v, p_outpic->p[V_PLANE].i_pitch );
         if( v == 0 && u != 0 )
@@ -173,8 +177,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
     }
 
     /* luminance */
-    p_filter->p_libvlc->pf_memcpy(
-                p_outpic->p[Y_PLANE].p_pixels, p_pic->p[Y_PLANE].p_pixels,
+    vlc_memcpy( p_outpic->p[Y_PLANE].p_pixels, p_pic->p[Y_PLANE].p_pixels,
                 p_outpic->p[Y_PLANE].i_lines * p_outpic->p[Y_PLANE].i_pitch );
 
     /* image visualization */
@@ -184,6 +187,8 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
     p_converted = image_Convert( p_filter->p_sys->p_image, p_pic,
                                  &(p_pic->format), &fmt_out );
 
+    if( p_converted )
+    {
 #define copyimage( plane, b ) \
     for( y=0; y<p_converted->p[plane].i_visible_lines; y++) { \
     for( x=0; x<p_converted->p[plane].i_visible_pitch; x++) { \
@@ -204,6 +209,11 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
 #undef copyimage
 
     p_converted->pf_release( p_converted );
+    }
+    else
+    {
+        msg_Err( p_filter, "Image scaling failed miserably." );
+    }
 
     p_filter->p_sys->x += p_filter->p_sys->xinc;
     p_filter->p_sys->y += p_filter->p_sys->yinc;