Commit 2acc282c authored by Blake Livingston's avatar Blake Livingston Committed by Rémi Duraffort

Setting b_subtitle on subpictures during transcode, and applying correct timing.

Signed-off-by: default avatarLaurent Aimar <fenrir@videolan.org>
Signed-off-by: default avatarRémi Duraffort <ivoire@videolan.org>
parent d374edab
...@@ -37,7 +37,9 @@ ...@@ -37,7 +37,9 @@
static subpicture_t *spu_new_buffer( decoder_t *p_dec ) static subpicture_t *spu_new_buffer( decoder_t *p_dec )
{ {
VLC_UNUSED( p_dec ); VLC_UNUSED( p_dec );
return subpicture_New(); subpicture_t *p_subpicture = subpicture_New();
p_subpicture->b_subtitle = true;
return p_subpicture;
} }
static void spu_del_buffer( decoder_t *p_dec, subpicture_t *p_subpic ) static void spu_del_buffer( decoder_t *p_dec, subpicture_t *p_subpic )
......
...@@ -694,9 +694,8 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_t *id, ...@@ -694,9 +694,8 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_t *id,
else else
fmt = id->p_decoder->fmt_out.video; fmt = id->p_decoder->fmt_out.video;
/* FIXME the mdate() seems highly suspicious */
spu_RenderSubpictures( p_sys->p_spu, p_pic, &fmt, spu_RenderSubpictures( p_sys->p_spu, p_pic, &fmt,
p_subpic, &id->p_decoder->fmt_out.video, mdate() ); p_subpic, &id->p_decoder->fmt_out.video, p_pic->date );
} }
/* Run user specified filter chain */ /* Run user specified filter chain */
......
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