Skip to content

V
vlc-2-2
Commit 9a04dfd7 authored by Rémi Duraffort's avatar Rémi Duraffort
Browse files
Options

opengllayer: the variable is a void* and not an integer and must be named drawable-nsobject.

parent 0957d357
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
modules/video_output/opengllayer.m
View file @ 9a04dfd7
...@@ -167,7 +167,6 @@ static int Init( vout_thread_t *p_vout ) ...@@ -167,7 +167,6 @@ static int Init( vout_thread_t *p_vout )
{ {
vout_sys_t *p_sys = p_vout->p_sys; vout_sys_t *p_sys = p_vout->p_sys;
int i_pixel_pitch; int i_pixel_pitch;
vlc_value_t val;
#if ( defined( WORDS_BIGENDIAN ) && VLCGL_FORMAT == GL_YCBCR_422_APPLE ) || (VLCGL_FORMAT == YCBCR_MESA) #if ( defined( WORDS_BIGENDIAN ) && VLCGL_FORMAT == GL_YCBCR_422_APPLE ) || (VLCGL_FORMAT == YCBCR_MESA)
p_vout->output.i_chroma = VLC_CODEC_YUYV; p_vout->output.i_chroma = VLC_CODEC_YUYV;
...@@ -184,12 +183,9 @@ static int Init( vout_thread_t *p_vout ) ...@@ -184,12 +183,9 @@ static int Init( vout_thread_t *p_vout )
p_vout->output.i_aspect = p_vout->render.i_aspect; p_vout->output.i_aspect = p_vout->render.i_aspect;
/* We do need a drawable to work properly */ /* We do need a drawable to work properly */
vlc_value_t value_drawable; p_vout->p_sys->o_cocoa_container = (id)var_CreateGetAddress( p_vout,
var_Create( p_vout, "drawable-gl", VLC_VAR_DOINHERIT ); "drawable-nsobject" );
var_Get( p_vout, "drawable-gl", &value_drawable );
p_vout->p_sys->o_cocoa_container = (id) value_drawable.i_int;
p_vout->fmt_out = p_vout->fmt_in; p_vout->fmt_out = p_vout->fmt_in;
p_vout->fmt_out.i_chroma = p_vout->output.i_chroma; p_vout->fmt_out.i_chroma = p_vout->output.i_chroma;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment