Commit 46df8eb2 authored by Jean-Paul Saman's avatar Jean-Paul Saman Committed by Jean-Paul Saman

Add initialisation of p_dec->fmt_out so it can be used inside transcode to...

Add initialisation of p_dec->fmt_out so it can be used inside transcode to determine the decoders output format.
parent e206fb1c
...@@ -188,11 +188,11 @@ static int Open( vlc_object_t *p_this ) ...@@ -188,11 +188,11 @@ static int Open( vlc_object_t *p_this )
p_sys->b_text = var_CreateGetBool( p_dec, "vbi-text" ); p_sys->b_text = var_CreateGetBool( p_dec, "vbi-text" );
// var_AddCallback( p_dec, "vbi-text", Text, p_sys ); // var_AddCallback( p_dec, "vbi-text", Text, p_sys );
// es_format_Init( &p_dec->fmt_out, SPU_ES, VLC_FOURCC( 's','p','u',' ' ) ); es_format_Init( &p_dec->fmt_out, SPU_ES, VLC_FOURCC( 's','p','u',' ' ) );
// if( p_sys->b_text ) if( p_sys->b_text )
// p_dec->fmt_out.video.i_chroma = VLC_FOURCC('T','E','X','T'); p_dec->fmt_out.video.i_chroma = VLC_FOURCC('T','E','X','T');
// else else
// p_dec->fmt_out.video.i_chroma = VLC_FOURCC('R','G','B','A'); p_dec->fmt_out.video.i_chroma = VLC_FOURCC('R','G','B','A');
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -303,7 +303,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block ) ...@@ -303,7 +303,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
/* Normal text subs, easy markup */ /* Normal text subs, easy markup */
p_spu->i_flags = p_sys->i_align; p_spu->i_flags = p_sys->i_align;
p_spu->i_start = p_block->i_pts; p_spu->i_start = (mtime_t) p_block->i_pts;
p_spu->i_stop = (mtime_t) 0; p_spu->i_stop = (mtime_t) 0;
p_spu->b_ephemer = VLC_TRUE; p_spu->b_ephemer = VLC_TRUE;
p_spu->b_absolute = VLC_FALSE; p_spu->b_absolute = VLC_FALSE;
......
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