utf8_* -> vlc_* (sed roxxors)

[vlc] / modules / video_filter / filter_common.h

diff --git a/modules/video_filter/filter_common.h b/modules/video_filter/filter_common.h
index 2f3e40e9870d66f911eeb1333f7c1108296c8159..5413cc7ff8822b2c33c3b213ca513fe3d81da3a6 100644 (file)
--- a/modules/video_filter/filter_common.h
+++ b/modules/video_filter/filter_common.h
@@ -50,7 +50,8 @@ static inline void vout_filter_AllocateDirectBuffers( vout_thread_t *p_vout, int
         vout_AllocatePicture( VLC_OBJECT(p_vout), p_pic, p_vout->output.i_chroma,
                               p_vout->output.i_width,
                               p_vout->output.i_height,
-                              p_vout->output.i_aspect );
+                              p_vout->output.i_aspect * p_vout->output.i_height,
+                              VOUT_ASPECT_FACTOR      * p_vout->output.i_width );
 
         if( !p_pic->i_planes )
             break;
@@ -107,9 +108,9 @@ static inline void vout_filter_SetupChild( vout_thread_t *p_parent, vout_thread_
     int (*pf_execute)( vlc_object_t *, const char *, vlc_callback_t, void * );
 
     if( b_init )
-        pf_execute = __var_AddCallback;
+        pf_execute = var_AddCallback;
     else
-        pf_execute = __var_DelCallback;
+        pf_execute = var_DelCallback;
 
     /* */
     if( !pf_mouse_event )