control/video: find the vout anywhere, so the one spawned by audio output (audio...

[vlc] / src / control / video.c

diff --git a/src/control/video.c b/src/control/video.c
index 4dc0c2181e7c2c424736381fa9d1b20610f14fa9..fbe1ee8bcea1c8170aa85832c4a7ecc2d4b992db 100644 (file)
--- a/src/control/video.c
+++ b/src/control/video.c
@@ -43,7 +43,7 @@ static vout_thread_t *GetVout( libvlc_media_instance_t *p_mi,
 
     if( p_input_thread )
     {
-        p_vout = vlc_object_find( p_input_thread, VLC_OBJECT_VOUT, FIND_CHILD );
+        p_vout = vlc_object_find( p_input_thread, VLC_OBJECT_VOUT, FIND_ANYWHERE );
         if( !p_vout )
         {
             libvlc_exception_raise( p_exception, "No active video output" );
@@ -359,9 +359,9 @@ char *libvlc_video_get_aspect_ratio( libvlc_media_instance_t *p_mi,
     if( !p_vout )
         return 0;
 
-    psz_aspect = var_GetString( p_vout, "aspect-ratio" );
+    psz_aspect = var_GetNonEmptyString( p_vout, "aspect-ratio" );
     vlc_object_release( p_vout );
-    return psz_aspect;
+    return psz_aspect ? psz_aspect : strdup("");
 }
 
 void libvlc_video_set_aspect_ratio( libvlc_media_instance_t *p_mi,
@@ -458,9 +458,9 @@ char *libvlc_video_get_crop_geometry( libvlc_media_instance_t *p_mi,
     if( !p_vout )
         return 0;
 
-    psz_geometry = var_GetString( p_vout, "crop" );
+    psz_geometry = var_GetNonEmptyString( p_vout, "crop" );
     vlc_object_release( p_vout );
-    return psz_geometry;
+    return psz_geometry ? psz_geometry : strdup("");
 }
 
 void libvlc_video_set_crop_geometry( libvlc_media_instance_t *p_mi,