Skip to content

V
vlc-1.1
Commit 512a3c67 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/access/dvdnav.c: backport of 11362.

parent 9c55abfc
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
modules/access/dvdnav.c
View file @ 512a3c67
...@@ -132,6 +132,7 @@ struct demux_sys_t ...@@ -132,6 +132,7 @@ struct demux_sys_t
/* palette for menus */ /* palette for menus */
uint32_t clut[16]; uint32_t clut[16];
uint8_t palette[4][4]; uint8_t palette[4][4];
vlc_bool_t b_spu_change;
/* */ /* */
int i_aspect; int i_aspect;
...@@ -215,6 +216,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -215,6 +216,7 @@ static int Open( vlc_object_t *p_this )
p_sys->i_aspect = -1; p_sys->i_aspect = -1;
p_sys->i_mux_rate = 0; p_sys->i_mux_rate = 0;
p_sys->i_pgc_length = 0; p_sys->i_pgc_length = 0;
p_sys->b_spu_change = 0;
if( 1 ) if( 1 )
{ {
...@@ -632,6 +634,7 @@ static int Demux( demux_t *p_demux ) ...@@ -632,6 +634,7 @@ static int Demux( demux_t *p_demux )
event->physical_pan_scan ); event->physical_pan_scan );
ESSubtitleUpdate( p_demux ); ESSubtitleUpdate( p_demux );
p_sys->b_spu_change = 1;
/* HACK to get the SPU tracks registered in the right order */ /* HACK to get the SPU tracks registered in the right order */
for( i = 0; i < 0x1f; i++ ) for( i = 0; i < 0x1f; i++ )
...@@ -740,6 +743,8 @@ static int Demux( demux_t *p_demux ) ...@@ -740,6 +743,8 @@ static int Demux( demux_t *p_demux )
* - ... * - ...
*/ */
DemuxBlock( p_demux, packet, i_len ); DemuxBlock( p_demux, packet, i_len );
if( p_sys->b_spu_change ) ButtonUpdate( p_demux, 0 );
p_sys->b_spu_change = 0;
break; break;
} }
......
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