[vlc-commits] commit: Select wrapper video output if --vout is specified on Mac OS ( David Menestrina )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | David Menestrina <dmenest-vlc at ofb.net> | Wed May  5 14:25:05 2010 -0700| [54fb5e05d8cf5c1f2a0a649203584027af4bf46f] | committer: Laurent Aimar 

Select wrapper video output if --vout is specified on Mac OS

Signed-off-by: Laurent Aimar <fenrir at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=54fb5e05d8cf5c1f2a0a649203584027af4bf46f
---

 src/video_output/video_output.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index da6e7b6..a6225bb 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -463,6 +463,18 @@ vout_thread_t * vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
     if( !p_vout->p->psz_filter_chain || !*p_vout->p->psz_filter_chain )
     {
         psz_parser = NULL;
+#ifdef __APPLE__
+        // On Mac OS, the wrapper video output module has lower precedence
+        // than the opengl module.  So if a vout is requested, we must
+        // select the wrapper video output module.
+        char *psz_vout = var_CreateGetNonEmptyString( p_vout, "vout" );
+        if( psz_vout )
+        {
+            if( strcmp( psz_vout, "opengl" ) != 0 )
+                psz_parser = strdup( "vout_wrapper" );
+            free( psz_vout );
+        }
+#endif
     }
     else
     {