vlc | branch: master | Laurent Aimar <fen...@videolan.org> | Tue Jan 10 20:50:42 2012 +0100| [d650147f1ce9b4bb7fd141c1841eb342d1048a5f] | committer: Laurent Aimar
Fixed the format used for subtitles blending when transcoding. With [447719222b4a2496482571f1725aaf36b3d2d19e], it closes #5755 and #5756. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d650147f1ce9b4bb7fd141c1841eb342d1048a5f --- modules/stream_out/transcode/video.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/stream_out/transcode/video.c b/modules/stream_out/transcode/video.c index 130f64b..d1aa9c4 100644 --- a/modules/stream_out/transcode/video.c +++ b/modules/stream_out/transcode/video.c @@ -680,11 +680,14 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_t *id, /* Check if we have a subpicture to overlay */ if( p_sys->p_spu ) { - video_format_t fmt; - if( filter_chain_GetLength( id->p_f_chain ) > 0 ) - fmt = filter_chain_GetFmtOut( id->p_f_chain )->video; - else - fmt = id->p_decoder->fmt_out.video; + video_format_t fmt = id->p_encoder->fmt_in.video; + if( fmt.i_visible_width <= 0 || fmt.i_visible_height <= 0 ) + { + fmt.i_visible_width = fmt.i_width; + fmt.i_visible_height = fmt.i_height; + fmt.i_x_offset = 0; + fmt.i_y_offset = 0; + } subpicture_t *p_subpic = spu_Render( p_sys->p_spu, NULL, &fmt, &fmt, p_pic->date, p_pic->date, false ); _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
