Commit 6c67a6b1 authored by Sam Hocevar's avatar Sam Hocevar

  * Fixed a crash in subtitle rendering.
  * Activated old crappy subtitle rendering in overlay mode (ugly but
    probably better than having no subtitles at all).
parent a0bb5da4
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
HEAD HEAD
* Fixed a crash in subtitle rendering.
* Activated old crappy subtitle rendering in overlay mode (ugly but
probably better than having no subtitles at all).
* Added proper Conflicts: rules in debian/control. * Added proper Conflicts: rules in debian/control.
* configure.in fixes for BSD/OS. * configure.in fixes for BSD/OS.
* Added BSD/OS libdvd by Steven M. Schultz <sms@TO.GD-ES.COM> in * Added BSD/OS libdvd by Steven M. Schultz <sms@TO.GD-ES.COM> in
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* thread, and destroy a previously oppened video output thread. * thread, and destroy a previously oppened video output thread.
***************************************************************************** *****************************************************************************
* Copyright (C) 2000 VideoLAN * Copyright (C) 2000 VideoLAN
* $Id: video_output.c,v 1.136 2001/08/03 18:03:32 gbazin Exp $ * $Id: video_output.c,v 1.137 2001/08/14 00:00:04 sam Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* *
...@@ -873,8 +873,8 @@ static int InitThread( vout_thread_t *p_vout ) ...@@ -873,8 +873,8 @@ static int InitThread( vout_thread_t *p_vout )
if( p_vout->pf_create( p_vout ) ) if( p_vout->pf_create( p_vout ) )
{ {
/* If pf_create has failed then we have to make sure /* If pf_create has failed then we have to make sure
* pf_destroy won't be called, because the plugin should have * pf_destroy won't be called, because the plugin should have
* cleaned up all its mess */ * cleaned up all its mess */
p_vout->pf_destroy = NULL; p_vout->pf_destroy = NULL;
return( 1 ); return( 1 );
} }
...@@ -922,8 +922,8 @@ static int InitThread( vout_thread_t *p_vout ) ...@@ -922,8 +922,8 @@ static int InitThread( vout_thread_t *p_vout )
if( p_vout->pf_init( p_vout ) ) if( p_vout->pf_init( p_vout ) )
{ {
/* If pf_init has failed then we have to make sure /* If pf_init has failed then we have to make sure
* pf_destroy won't be called, because the plugin should have * pf_destroy won't be called, because the plugin should have
* cleaned up all its mess */ * cleaned up all its mess */
p_vout->pf_destroy = NULL; p_vout->pf_destroy = NULL;
return( 1 ); return( 1 );
} }
...@@ -2001,11 +2001,17 @@ static void RenderSubPicture( vout_thread_t *p_vout, picture_t *p_pic, ...@@ -2001,11 +2001,17 @@ static void RenderSubPicture( vout_thread_t *p_vout, picture_t *p_pic,
switch( p_subpic->i_type ) switch( p_subpic->i_type )
{ {
case DVD_SUBPICTURE: /* DVD subpicture unit */ case DVD_SUBPICTURE: /* DVD subpicture unit */
vout_RenderRGBSPU( p_pic, p_subpic, if( p_vout->b_need_render )
&p_vout->p_buffer[ p_vout->i_buffer_index ], {
p_vout->i_bytes_per_pixel, vout_RenderRGBSPU( p_pic, p_subpic,
p_vout->i_bytes_per_line ); &p_vout->p_buffer[ p_vout->i_buffer_index ],
/* vout_RenderYUVSPU( p_pic, p_subpic ); */ p_vout->i_bytes_per_pixel,
p_vout->i_bytes_per_line );
}
else
{
vout_RenderYUVSPU( p_pic, p_subpic );
}
break; break;
case TEXT_SUBPICTURE: /* single line text */ case TEXT_SUBPICTURE: /* single line text */
......
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