Skip to content

V
vlc-gpu
Commit 9bb495cb authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* Compile fix

parent 97034b01
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
modules/codec/quicktime.c
View file @ 9bb495cb
...@@ -114,7 +114,7 @@ struct decoder_sys_t ...@@ -114,7 +114,7 @@ struct decoder_sys_t
#endif /* LOADER */ #endif /* LOADER */
HMODULE qtml; HMODULE qtml;
HINSTANCE qtime_qts; HINSTANCE qts;
OSErr (*InitializeQTML) ( long flags ); OSErr (*InitializeQTML) ( long flags );
OSErr (*TerminateQTML) ( void ); OSErr (*TerminateQTML) ( void );
#endif /* SYS_DARWIN */ #endif /* SYS_DARWIN */
...@@ -777,7 +777,7 @@ static int OpenVideo( decoder_t *p_dec ) ...@@ -777,7 +777,7 @@ static int OpenVideo( decoder_t *p_dec )
&p_sys->OutBufferRect, &p_sys->OutBufferRect,
0, 0, 0, 0, 0, 0,
p_sys->plane, p_sys->plane,
p_dec->fmt_in.video.i_width * 2 ); (long)p_dec->fmt_in.video.i_width * 2 );
msg_Dbg( p_dec, "NewGWorldFromPtr returned:%ld\n", msg_Dbg( p_dec, "NewGWorldFromPtr returned:%ld\n",
65536 - ( i_result&0xffff ) ); 65536 - ( i_result&0xffff ) );
...@@ -800,12 +800,11 @@ static int OpenVideo( decoder_t *p_dec ) ...@@ -800,12 +800,11 @@ static int OpenVideo( decoder_t *p_dec )
msg_Dbg( p_dec, "quicktime_video: ImageCodecPreDecompress cres=0x%X\n", msg_Dbg( p_dec, "quicktime_video: ImageCodecPreDecompress cres=0x%X\n",
(int)cres ); (int)cres );
p_dec->fmt_out.i_codec = VLC_FOURCC( 'Y', 'U', 'Y', '2' ); es_format_Init( &p_dec->fmt_out, VIDEO_ES, VLC_FOURCC( 'Y', 'U', 'Y', '2' ));
p_dec->fmt_out.video.i_width = p_dec->fmt_in.video.i_width; p_dec->fmt_out.video.i_width = p_dec->fmt_in.video.i_width;
p_dec->fmt_out.video.i_height= p_dec->fmt_in.video.i_height; p_dec->fmt_out.video.i_height= p_dec->fmt_in.video.i_height;
p_dec->fmt_out.video.i_aspect = VOUT_ASPECT_FACTOR * p_dec->fmt_in.video.i_width / p_dec->fmt_in.video.i_height; p_dec->fmt_out.video.i_aspect = VOUT_ASPECT_FACTOR * p_dec->fmt_in.video.i_width / p_dec->fmt_in.video.i_height;
vlc_mutex_unlock( lockval.p_address ); vlc_mutex_unlock( lockval.p_address );
return VLC_SUCCESS; return VLC_SUCCESS;
......
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