Sync PO files

[vlc] / modules / video_filter / rss.c

diff --git a/modules/video_filter/rss.c b/modules/video_filter/rss.c
index 768720422dc898f858ee3479f4402cbf2ecd1c5f..70bbdf1ee3f5009fe39c9c628c70f30a5f0f7908 100644 (file)
--- a/modules/video_filter/rss.c
+++ b/modules/video_filter/rss.c
@@ -34,7 +34,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
 
@@ -241,10 +241,7 @@ static int CreateFilter( vlc_object_t *p_this )
     /* Allocate structure */
     p_sys = p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
     if( p_sys == NULL )
-    {
-        msg_Err( p_filter, "out of memory" );
         return VLC_ENOMEM;
-    }
 
     vlc_mutex_init( &p_sys->lock );
     vlc_mutex_lock( &p_sys->lock );
@@ -267,9 +264,9 @@ static int CreateFilter( vlc_object_t *p_this )
     p_sys->psz_marquee = (char *)malloc( p_sys->i_length + 1 );
     if( p_sys->psz_marquee == NULL )
     {
-        msg_Err( p_filter, "out of memory" );
         vlc_mutex_unlock( &p_sys->lock );
         vlc_mutex_destroy( &p_sys->lock );
+        free( p_sys->psz_urls );
         free( p_sys );
         return VLC_ENOMEM;
     }
@@ -278,10 +275,10 @@ static int CreateFilter( vlc_object_t *p_this )
     p_sys->p_style = malloc( sizeof( text_style_t ));
     if( p_sys->p_style == NULL )
     {
-        msg_Err( p_filter, "out of memory" );
         free( p_sys->psz_marquee );
         vlc_mutex_unlock( &p_sys->lock );
         vlc_mutex_destroy( &p_sys->lock );
+        free( p_sys->psz_urls );
         free( p_sys );
         return VLC_ENOMEM;
     }
@@ -296,7 +293,7 @@ static int CreateFilter( vlc_object_t *p_this )
 
     if( p_sys->b_images == true && p_sys->p_style->i_font_size == -1 )
     {
-        msg_Warn( p_filter, "rrs-size wasn't specified. Feed images will thus be displayed without being resized" );
+        msg_Warn( p_filter, "rss-size wasn't specified. Feed images will thus be displayed without being resized" );
     }
 
     if( FetchRSS( p_filter ) )
@@ -306,6 +303,7 @@ static int CreateFilter( vlc_object_t *p_this )
         free( p_sys->psz_marquee );
         vlc_mutex_unlock( &p_sys->lock );
         vlc_mutex_destroy( &p_sys->lock );
+        free( p_sys->psz_urls );
         free( p_sys );
         return VLC_EGENERIC;
     }
@@ -317,6 +315,7 @@ static int CreateFilter( vlc_object_t *p_this )
         free( p_sys->psz_marquee );
         vlc_mutex_unlock( &p_sys->lock );
         vlc_mutex_destroy( &p_sys->lock );
+        free( p_sys->psz_urls );
         free( p_sys );
         return VLC_EGENERIC;
     }
@@ -329,6 +328,7 @@ static int CreateFilter( vlc_object_t *p_this )
             FreeRSS( p_filter );
             vlc_mutex_unlock( &p_sys->lock );
             vlc_mutex_destroy( &p_sys->lock );
+            free( p_sys->psz_urls );
             free( p_sys );
             return VLC_EGENERIC;
         }
@@ -434,7 +434,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
         }
     }
 
-    p_spu = p_filter->pf_sub_buffer_new( p_filter );
+    p_spu = filter_NewSubpicture( p_filter );
     if( !p_spu )
     {
         vlc_mutex_unlock( &p_sys->lock );
@@ -613,7 +613,7 @@ static picture_t *LoadImage( filter_t *p_filter, const char *psz_url )
         fmt_out.i_height = p_sys->p_style->i_font_size;
 
         p_pic = image_Convert( p_handler, p_orig, &fmt_in, &fmt_out );
-        p_orig->pf_release( p_orig );
+        picture_Release( p_orig );
         if( !p_pic )
         {
             msg_Warn( p_filter, "Error while converting %s", psz_url );
@@ -981,7 +981,7 @@ static void FreeRSS( filter_t *p_filter)
         free( p_feed->psz_description );
         free( p_feed->psz_image );
         if( p_feed->p_pic != NULL )
-            p_feed->p_pic->pf_release( p_feed->p_pic );
+            picture_Release( p_feed->p_pic );
     }
     free( p_sys->p_feeds );
     p_sys->i_feeds = 0;