Merge commit 'origin/base'

[vlc] / include / vlc_filter.h

diff --git a/include/vlc_filter.h b/include/vlc_filter.h
index b1f23250587053a332e7d99a4597a03445c24b5b..6dbb2f117ca115564918b3e12b8c530aa7516617 100644 (file)
--- a/include/vlc_filter.h
+++ b/include/vlc_filter.h
@@ -22,10 +22,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_FILTER_H
-#define _VLC_FILTER_H 1
+#ifndef VLC_FILTER_H
+#define VLC_FILTER_H 1
 
 #include <vlc_es.h>
+#include <vlc_picture.h>
+#include <vlc_subpicture.h>
 
 /**
  * \file
@@ -59,7 +61,7 @@ struct filter_t
 
     picture_t *         ( * pf_video_filter ) ( filter_t *, picture_t * );
     block_t *           ( * pf_audio_filter ) ( filter_t *, block_t * );
-    void                ( * pf_video_blend )  ( filter_t *, picture_t *,
+    void                ( * pf_video_blend )  ( filter_t *,
                                                 picture_t *, picture_t *,
                                                 int, int, int );
 
@@ -177,17 +179,12 @@ static inline block_t *filter_NewAudioBuffer( filter_t *p_filter, int i_size )
                                         picture_t *p_pic )              \
     {                                                                   \
         picture_t *p_outpic = filter_NewPicture( p_filter );            \
-        if( !p_outpic )                                                 \
+        if( p_outpic )                                                  \
         {                                                               \
-            picture_Release( p_pic );                                   \
-            return NULL;                                                \
+            name( p_filter, p_pic, p_outpic );                          \
+            picture_CopyProperties( p_outpic, p_pic );                  \
         }                                                               \
-                                                                        \
-        name( p_filter, p_pic, p_outpic );                              \
-                                                                        \
-        picture_CopyProperties( p_outpic, p_pic );                      \
         picture_Release( p_pic );                                       \
-                                                                        \
         return p_outpic;                                                \
     }