http access: Use EnsureUTF8() on the ICY strings. Avoids "illegal byte sequence"...

[vlc] / modules / video_filter / invert.c

diff --git a/modules/video_filter/invert.c b/modules/video_filter/invert.c
index c11e1ad4f441c1e29ac099b4d9418d5d8ef57f14..1700c1d7eb7fab4234a0c8e0722305b228ec4d89 100644 (file)
--- a/modules/video_filter/invert.c
+++ b/modules/video_filter/invert.c
@@ -25,10 +25,16 @@
  * Preamble
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_vout.h>
 
 #include "vlc_filter.h"
+#include "filter_picture.h"
 
 /*****************************************************************************
  * Local prototypes
@@ -42,8 +48,8 @@ static picture_t *Filter( filter_t *, picture_t * );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("Invert video filter") );
-    set_shortname( _("Color inversion" ));
+    set_description( N_("Invert video filter") );
+    set_shortname( N_("Color inversion" ));
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );
     set_capability( "video filter2", 0 );
@@ -73,10 +79,7 @@ static int Create( vlc_object_t *p_this )
     /* Allocate structure */
     p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
     if( p_filter->p_sys == NULL )
-    {
-        msg_Err( p_filter, "out of memory" );
         return VLC_ENOMEM;
-    }
 
     p_filter->pf_video_filter = Filter;
 
@@ -110,12 +113,11 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
 
     if( !p_pic ) return NULL;
 
-    p_outpic = p_filter->pf_vout_buffer_new( p_filter );
+    p_outpic = filter_NewPicture( p_filter );
     if( !p_outpic )
     {
         msg_Warn( p_filter, "can't get output picture" );
-        if( p_pic->pf_release )
-            p_pic->pf_release( p_pic );
+        picture_Release( p_pic );
         return NULL;
     }
 
@@ -123,7 +125,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
     {
         /* We don't want to invert the alpha plane */
         i_planes = p_pic->i_planes - 1;
-        p_filter->p_libvlc->pf_memcpy(
+        vlc_memcpy(
             p_outpic->p[A_PLANE].p_pixels, p_pic->p[A_PLANE].p_pixels,
             p_pic->p[A_PLANE].i_pitch *  p_pic->p[A_PLANE].i_lines );
     }
@@ -151,7 +153,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
             p_in64 = (uint64_t*)p_in;
             p_out64 = (uint64_t*)p_out;
 
-            while( p_in64 < p_line_end )
+            while( p_in64 < (uint64_t *)p_line_end )
             {
                 /* Do 64 pixels at a time */
                 *p_out64++ = ~*p_in64++; *p_out64++ = ~*p_in64++;
@@ -176,14 +178,5 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
         }
     }
 
-    p_outpic->date = p_pic->date;
-    p_outpic->b_force = p_pic->b_force;
-    p_outpic->i_nb_fields = p_pic->i_nb_fields;
-    p_outpic->b_progressive = p_pic->b_progressive;
-    p_outpic->b_top_field_first = p_pic->b_top_field_first;
-
-    if( p_pic->pf_release )
-        p_pic->pf_release( p_pic );
-
-    return p_outpic;
+    return CopyInfoAndRelease( p_outpic, p_pic );
 }