spu: remove filter_DeleteSubpicture()

This is only used in error corner cases, and is always the same as
calling subpicture_Delete() directly.

diff --git a/include/vlc_filter.h b/include/vlc_filter.h
index 4aebe8bd9d89f30b9b5656337c16f2d2fef2b700..8e023614a2c4ca52572db76898008f6b40e3e5bb 100644 (file)
--- a/include/vlc_filter.h
+++ b/include/vlc_filter.h
@@ -50,7 +50,6 @@ typedef struct filter_owner_t
         struct
         {
             subpicture_t * (*buffer_new)( filter_t * );
-            void           (*buffer_del)( filter_t *, subpicture_t * );
         } sub;
     };
 } filter_owner_t;
@@ -181,8 +180,8 @@ static inline void filter_FlushPictures( filter_t *p_filter )
 
 /**
  * This function will return a new subpicture usable by p_filter as an output
- * buffer. You have to release it using filter_DeleteSubpicture or by returning
- * it to the caller as a pf_sub_source return value.
+ * buffer. You have to release it using subpicture_Delete or by returning it to
+ * the caller as a pf_sub_source return value.
  * Provided for convenience.
  *
  * \param p_filter filter_t object
@@ -196,19 +195,6 @@ static inline subpicture_t *filter_NewSubpicture( filter_t *p_filter )
     return subpic;
 }
 
-/**
- * This function will release a subpicture create by filter_NewSubicture.
- * Provided for convenience.
- *
- * \param p_filter filter_t object
- * \param p_subpicture to be released
- */
-static inline void filter_DeleteSubpicture( filter_t *p_filter,
-                                            subpicture_t *subpic )
-{
-    p_filter->owner.sub.buffer_del( p_filter, subpic );
-}
-
 /**
  * This function gives all input attachments at once.
  *

diff --git a/modules/video_filter/audiobargraph_v.c b/modules/video_filter/audiobargraph_v.c
index 8cb5565868e82cfa1aa1fb23c7b33bf1308780af..bde9b083dd4f392d57fb8b7e8b163a5c1e60c03f 100644 (file)
--- a/modules/video_filter/audiobargraph_v.c
+++ b/modules/video_filter/audiobargraph_v.c
@@ -400,7 +400,7 @@ static subpicture_t *FilterSub(filter_t *p_filter, mtime_t date)
     p_region = subpicture_region_New(&fmt);
     if (!p_region) {
         msg_Err(p_filter, "cannot allocate SPU region");
-        filter_DeleteSubpicture(p_filter, p_spu);
+        subpicture_Delete(p_spu);
         p_spu = NULL;
         goto exit;
     }

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index 12e14ab529af96b2ee6b3137c68f30ac703e6266..a41055ebea3931e478aaa0bbea2a5784ea447004 100644 (file)
--- a/modules/video_filter/logo.c
+++ b/modules/video_filter/logo.c
@@ -390,7 +390,7 @@ static subpicture_t *FilterSub( filter_t *p_filter, mtime_t date )
     if( !p_region )
     {
         msg_Err( p_filter, "cannot allocate SPU region" );
-        filter_DeleteSubpicture( p_filter, p_spu );
+        subpicture_Delete( p_spu );
         p_spu = NULL;
         goto exit;
     }

diff --git a/modules/video_filter/marq.c b/modules/video_filter/marq.c
index 550ce7d878ca3fa63bcac99589f6b5e610eb41c8..9618c7cf21bdbbca838af4c37795757218074d1d 100644 (file)
--- a/modules/video_filter/marq.c
+++ b/modules/video_filter/marq.c
@@ -303,7 +303,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
     p_spu->p_region = subpicture_region_New( &fmt );
     if( !p_spu->p_region )
     {
-        filter_DeleteSubpicture( p_filter, p_spu );
+        subpicture_Delete( p_spu );
         p_spu = NULL;
         goto out;
     }

diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c
index 7ed5dc497fb4738319dc1e5dc61c2fcf205208fb..56b695bd2c031fe8f72f360d7e34eb9d09a4bbd2 100644 (file)
--- a/modules/video_filter/mosaic.c
+++ b/modules/video_filter/mosaic.c
@@ -648,7 +648,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
         if( !p_region )
         {
             msg_Err( p_filter, "cannot allocate SPU region" );
-            filter_DeleteSubpicture( p_filter, p_spu );
+            subpicture_Delete( p_spu );
             vlc_global_unlock( VLC_MOSAIC_MUTEX );
             vlc_mutex_unlock( &p_sys->lock );
             return p_spu;

diff --git a/modules/video_filter/remoteosd.c b/modules/video_filter/remoteosd.c
index 836ade608eed502f880c0232ece8ba88ed6bd83c..9a4e6e58bd2cc0074d9336cea2b62de734b0a541 100644 (file)
--- a/modules/video_filter/remoteosd.c
+++ b/modules/video_filter/remoteosd.c
@@ -1131,7 +1131,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
     if( !p_region )
     {
         msg_Err( p_filter, "cannot allocate SPU region" );
-        filter_DeleteSubpicture( p_filter, p_spu );
+        subpicture_Delete( p_spu );
         vlc_mutex_unlock( &p_sys->lock );
         return NULL;
     }

diff --git a/modules/video_filter/rss.c b/modules/video_filter/rss.c
index b8b97cd1516d68ee113a7356b8232872a27ab262..b641023046851690b51e77850a270e5a70f9dd80 100644 (file)
--- a/modules/video_filter/rss.c
+++ b/modules/video_filter/rss.c
@@ -414,7 +414,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
     p_spu->p_region = subpicture_region_New( &fmt );
     if( !p_spu->p_region )
     {
-        filter_DeleteSubpicture( p_filter, p_spu );
+        subpicture_Delete( p_spu );
         vlc_mutex_unlock( &p_sys->lock );
         return NULL;
     }

diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c
index 09bac6796bd476f7c37818385da2353c73c8c2ea..544bb5c8657834cbcb0d1eef8eb5341bd626db96 100644 (file)
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -1155,12 +1155,6 @@ static subpicture_t *sub_new_buffer(filter_t *filter)
     return subpicture;
 }
 
-static void sub_del_buffer(filter_t *filter, subpicture_t *subpic)
-{
-    VLC_UNUSED(filter);
-    subpicture_Delete(subpic);
-}
-
 static int SubSourceInit(filter_t *filter, void *data)
 {
     spu_t *spu = data;
@@ -1168,7 +1162,6 @@ static int SubSourceInit(filter_t *filter, void *data)
 
     filter->owner.sys = (void *)(intptr_t)channel;
     filter->owner.sub.buffer_new = sub_new_buffer;
-    filter->owner.sub.buffer_del = sub_del_buffer;
     return VLC_SUCCESS;
 }