Commit 7f3551d5 authored by Gildas Bazin's avatar Gildas Bazin

* modules/video_output/directx/directx.c: fixed crash with 256 colors mode.

parent 88e9c039
...@@ -76,6 +76,7 @@ static int Init ( vout_thread_t * ); ...@@ -76,6 +76,7 @@ static int Init ( vout_thread_t * );
static void End ( vout_thread_t * ); static void End ( vout_thread_t * );
static int Manage ( vout_thread_t * ); static int Manage ( vout_thread_t * );
static void Display ( vout_thread_t *, picture_t * ); static void Display ( vout_thread_t *, picture_t * );
static void SetPalette( vout_thread_t *, uint16_t *, uint16_t *, uint16_t * );
static int NewPictureVec ( vout_thread_t *, picture_t *, int ); static int NewPictureVec ( vout_thread_t *, picture_t *, int );
static void FreePictureVec ( vout_thread_t *, picture_t *, int ); static void FreePictureVec ( vout_thread_t *, picture_t *, int );
...@@ -1497,8 +1498,9 @@ static int NewPictureVec( vout_thread_t *p_vout, picture_t *p_pic, ...@@ -1497,8 +1498,9 @@ static int NewPictureVec( vout_thread_t *p_vout, picture_t *p_pic,
{ {
switch( ddpfPixelFormat.dwRGBBitCount ) switch( ddpfPixelFormat.dwRGBBitCount )
{ {
case 8: /* FIXME: set the palette */ case 8:
p_vout->output.i_chroma = VLC_FOURCC('R','G','B','2'); p_vout->output.i_chroma = VLC_FOURCC('R','G','B','2');
p_vout->output.pf_setpalette = SetPalette;
break; break;
case 15: case 15:
p_vout->output.i_chroma = VLC_FOURCC('R','V','1','5'); p_vout->output.i_chroma = VLC_FOURCC('R','V','1','5');
...@@ -2114,3 +2116,12 @@ static int WallpaperCallback( vlc_object_t *p_this, char const *psz_cmd, ...@@ -2114,3 +2116,12 @@ static int WallpaperCallback( vlc_object_t *p_this, char const *psz_cmd,
return VLC_SUCCESS; return VLC_SUCCESS;
} }
/*****************************************************************************
* SetPalette: sets an 8 bpp palette
*****************************************************************************/
static void SetPalette( vout_thread_t *p_vout,
uint16_t *red, uint16_t *green, uint16_t *blue )
{
msg_Err( p_vout, "FIXME: SetPalette unimplemented" );
}
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