← Back to branch summary

~ubuntu-branches/debian/squeeze/vlc/squeeze

« back to all changes in this revision

Viewing changes to modules/video_filter/logo.c

  • Committer: Bazaar Package Importer
  • Author(s): Christophe Mutricy
  • Date: 2009-09-20 01:08:41 UTC
  • mto: This revision was merged to the branch mainline in revision 9.
  • Revision ID: james.westby@ubuntu.com-20090920010841-vc6vme91a70r5w0t
Tags: upstream-1.0.2
Import upstream version 1.0.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/video_filter/logo.c
2
2
 * logo.c : logo video plugin for vlc
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2003-2006 the VideoLAN team
5
 
 * $Id: bdc988d3b8f96adbf92ee45cdbf49f56994d5838 $
 
5
 * $Id: 92dd9c2ca8f08c4954cfcbb42c6d519c1afc8073 $
6
6
 *
7
7
 * Authors: Gildas Bazin <gbazin@videolan.org>
8
8
 *          Simon Latapie <garf@videolan.org>
393
393
        p_sys->p_blend->fmt_in.video.i_y_offset = 0;
394
394
    p_sys->p_blend->fmt_out.video.i_aspect = p_vout->render.i_aspect;
395
395
    p_sys->p_blend->fmt_out.video.i_chroma = p_vout->output.i_chroma;
 
396
 
 
397
    p_sys->p_blend->fmt_out.video.i_chroma = p_vout->output.i_chroma;
 
398
    p_sys->p_blend->fmt_out.video.i_rmask  = p_vout->output.i_rmask;
 
399
    p_sys->p_blend->fmt_out.video.i_gmask  = p_vout->output.i_gmask;
 
400
    p_sys->p_blend->fmt_out.video.i_bmask  = p_vout->output.i_bmask;
 
401
    p_sys->p_blend->fmt_out.video.i_rrshift= p_vout->output.i_rrshift;
 
402
    p_sys->p_blend->fmt_out.video.i_rgshift= p_vout->output.i_rgshift;
 
403
    p_sys->p_blend->fmt_out.video.i_rbshift= p_vout->output.i_rbshift;
 
404
    p_sys->p_blend->fmt_out.video.i_lrshift= p_vout->output.i_lrshift;
 
405
    p_sys->p_blend->fmt_out.video.i_lgshift= p_vout->output.i_lgshift;
 
406
    p_sys->p_blend->fmt_out.video.i_lbshift= p_vout->output.i_lbshift;
 
407
 
396
408
    p_sys->p_blend->fmt_in.video.i_chroma = VLC_FOURCC('Y','U','V','A');
397
409
    p_sys->p_blend->fmt_in.video.i_aspect = VOUT_ASPECT_FACTOR;
398
410
    p_sys->i_width =