[vlc-devel] commit: Fixed rgb masks when blending in logo filter. (Laurent Aimar )

git version control git at videolan.org
Wed Jul 29 22:48:01 CEST 2009


vlc | branch: 1.0-bugfix | Laurent Aimar <fenrir at videolan.org> | Wed Jul 29 22:44:20 2009 +0200| [d0710b67598cf02db62d9166f00b66357056769c] | committer: Laurent Aimar 

Fixed rgb masks when blending in logo filter.

It is a partial backport of [30086cdcb5559b0d2520dfece8fe7879995af4b4]

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

 modules/video_filter/logo.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index bdc988d..92dd9c2 100644
--- a/modules/video_filter/logo.c
+++ b/modules/video_filter/logo.c
@@ -393,6 +393,18 @@ static int Init( vout_thread_t *p_vout )
         p_sys->p_blend->fmt_in.video.i_y_offset = 0;
     p_sys->p_blend->fmt_out.video.i_aspect = p_vout->render.i_aspect;
     p_sys->p_blend->fmt_out.video.i_chroma = p_vout->output.i_chroma;
+
+    p_sys->p_blend->fmt_out.video.i_chroma = p_vout->output.i_chroma;
+    p_sys->p_blend->fmt_out.video.i_rmask  = p_vout->output.i_rmask;
+    p_sys->p_blend->fmt_out.video.i_gmask  = p_vout->output.i_gmask;
+    p_sys->p_blend->fmt_out.video.i_bmask  = p_vout->output.i_bmask;
+    p_sys->p_blend->fmt_out.video.i_rrshift= p_vout->output.i_rrshift;
+    p_sys->p_blend->fmt_out.video.i_rgshift= p_vout->output.i_rgshift;
+    p_sys->p_blend->fmt_out.video.i_rbshift= p_vout->output.i_rbshift;
+    p_sys->p_blend->fmt_out.video.i_lrshift= p_vout->output.i_lrshift;
+    p_sys->p_blend->fmt_out.video.i_lgshift= p_vout->output.i_lgshift;
+    p_sys->p_blend->fmt_out.video.i_lbshift= p_vout->output.i_lbshift;
+
     p_sys->p_blend->fmt_in.video.i_chroma = VLC_FOURCC('Y','U','V','A');
     p_sys->p_blend->fmt_in.video.i_aspect = VOUT_ASPECT_FACTOR;
     p_sys->i_width =




More information about the vlc-devel mailing list