]> git.sesse.net Git - vlc/blobdiff - src/video_output/video_text.c
Contrib: build libschro / liboil by default for OSX.
[vlc] / src / video_output / video_text.c
index d5cebcc4a18fba0a4f775c56d4aa2eb2d36b2393..d98532284ebcc843da9035136d1cffa3890e47c5 100644 (file)
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_block.h>
 #include <vlc_filter.h>
@@ -131,14 +131,7 @@ void __vout_OSDMessage( vlc_object_t *p_caller, int i_channel,
 
     if( !config_GetInt( p_caller, "osd" ) ) return;
 
-    if( p_caller->i_object_type == VLC_OBJECT_VOUT )
-    {
-        p_vout = (vout_thread_t*) p_caller;
-        vlc_object_yield( p_vout );
-    }
-    else
-        p_vout = vlc_object_find( p_caller, VLC_OBJECT_VOUT, FIND_ANYWHERE );
-
+    p_vout = vlc_object_find( p_caller, VLC_OBJECT_VOUT, FIND_ANYWHERE );
     if( p_vout )
     {
         va_start( args, psz_format );