<div>From 6bffb9add9df20610850e9a365246fd3ee968300 Mon Sep 17 00:00:00 2001</div><div>From: Blake Livingston <<a href="mailto:blake.a.livingston@gmail.com">blake.a.livingston@gmail.com</a>></div><div>Date: Tue, 20 Jul 2010 22:42:32 -0700</div>
<div>Subject: [PATCH] Setting b_subtitle on subpictures during transcode, and applying correct timing.</div><div><br></div><div>---</div><div> modules/stream_out/transcode/spu.c   |    4 +++-</div><div> modules/stream_out/transcode/video.c |    3 +--</div>
<div> 2 files changed, 4 insertions(+), 3 deletions(-)</div><div><br></div><div>diff --git a/modules/stream_out/transcode/spu.c b/modules/stream_out/transcode/spu.c</div><div>index d031d9a..31211d9 100644</div><div>--- a/modules/stream_out/transcode/spu.c</div>
<div>+++ b/modules/stream_out/transcode/spu.c</div><div>@@ -38,7 +38,9 @@ static subpicture_t *spu_new_buffer( decoder_t *p_dec,</div><div>                                      const subpicture_updater_t *p_upd )</div><div>
 {</div><div>     VLC_UNUSED( p_dec );</div><div>-    return subpicture_New( p_upd );</div><div>+    subpicture_t *p_subpicture = subpicture_New( p_upd );</div><div>+    p_subpicture->b_subtitle = true;</div><div>+    return p_subpicture;</div>
<div> }</div><div> </div><div> static void spu_del_buffer( decoder_t *p_dec, subpicture_t *p_subpic )</div><div>diff --git a/modules/stream_out/transcode/video.c b/modules/stream_out/transcode/video.c</div><div>index 8afe2c2..6d4f855 100644</div>
<div>--- a/modules/stream_out/transcode/video.c</div><div>+++ b/modules/stream_out/transcode/video.c</div><div>@@ -716,9 +716,8 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_t *id,</div><div>             else</div>
<div>                 fmt = id->p_decoder->fmt_out.video;</div><div> </div><div>-            /* FIXME the mdate() seems highly suspicious */</div><div>             spu_RenderSubpictures( p_sys->p_spu, p_pic, &fmt,</div>
<div>-                                   p_subpic, &id->p_decoder->fmt_out.video, mdate() );</div><div>+                                   p_subpic, &id->p_decoder->fmt_out.video, p_pic->date );</div>
<div>         }</div><div> </div><div>         /* Run user specified filter chain */</div><div>-- </div><div>1.7.0.4</div>