[vlc-commits] commit: Setting b_subtitle on subpictures during transcode, and applying correct timing. (Blake Livingston )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Blake Livingston <blake.a.livingston at gmail.com> | Tue Jul 20 22:42:32 2010 -0700| [2acc282c4d03bee9dab928e4ee757d6d148cfa1d] | committer: Rémi Duraffort 

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

Signed-off-by: Laurent Aimar <fenrir at videolan.org>
Signed-off-by: Rémi Duraffort <ivoire at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=2acc282c4d03bee9dab928e4ee757d6d148cfa1d
---

 modules/stream_out/transcode/spu.c   |    4 +++-
 modules/stream_out/transcode/video.c |    3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/stream_out/transcode/spu.c b/modules/stream_out/transcode/spu.c
index e493b6f..04325d9 100644
--- a/modules/stream_out/transcode/spu.c
+++ b/modules/stream_out/transcode/spu.c
@@ -37,7 +37,9 @@
 static subpicture_t *spu_new_buffer( decoder_t *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 )
diff --git a/modules/stream_out/transcode/video.c b/modules/stream_out/transcode/video.c
index 5bcc08a..4ec192c 100644
--- a/modules/stream_out/transcode/video.c
+++ b/modules/stream_out/transcode/video.c
@@ -694,9 +694,8 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_t *id,
             else
                 fmt = id->p_decoder->fmt_out.video;
 
-            /* FIXME the mdate() seems highly suspicious */
             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 */