Changeset 3f48284e78c07e2911b192f38b4650b835f642e9

Show
Ignore:
Timestamp:
02/25/08 21:44:40 (6 months ago)
Author:
Jean-Baptiste Kempf <jb@videolan.org>
git-committer:
Jean-Baptiste Kempf <jb@videolan.org> 1203972280 +0000
git-parent:

[78d012cc34fbb814ceeaa9488f342cf23ea07bf9]

git-author:
Jean-Baptiste Kempf <jb@videolan.org> 1203972280 +0000
Message:

XvMC: Compile Fixes, b_shm removal, and obvious typos... subpicture_sys_t still undeclared, no idea why it is around...

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/video_output/x11/xvmc.c

    r78d012c r3f48284  
    811811            msg_Dbg(p_vout, "xxmc_setup_subpictures"); 
    812812#ifdef HAVE_SYS_SHM_H 
    813             if( p_vout->p_sys->b_shm ) 
     813            if( p_vout->p_sys->i_shm_opcode ) 
    814814            { 
    815815                /* Create image using XShm extension */ 
    …… 
    842842                                                       * sp->entry_bytes ); 
    843843        xxmc_xvmc_free_subpicture( p_vout, sp); 
    844         if( !p_vout->p_sys->xvmc_pallette ) 
     844        if( !p_vout->p_sys->xvmc_palette ) 
    845845            return VLC_EGENERIC; 
    846846        p_vout->p_sys->hwSubpictures = 1; 
    …… 
    971971        { 
    972972            XVMCLOCKDISPLAY( p_vout->p_sys->p_display ); 
    973             if( Success != XvMCCreateSurface( p_vout->p_sys->p_display 
     973            if( Success != XvMCCreateSurface( p_vout->p_sys->p_display, 
    974974                                              context, 
    975975                                              handler->surfaces + i) ) 
    …… 
    13181318{ 
    13191319# ifdef HAVE_SYS_SHM_H 
    1320     if( p_vout->p_sys->b_shm ) 
     1320    if( p_vout->p_sys->i_shm_opcode ) 
    13211321    { 
    13221322        XShmDetach( p_vout->p_sys->p_display, shminfo ); 
    …… 
    13411341void xvmc_vld_frame( picture_t *picture ) 
    13421342{ 
    1343     vout_sys_t *p_sys = picture->p_sys; 
     1343    picture_sys_t *p_sys = picture->p_sys; 
    13441344    vout_thread_t *p_vout = p_sys->p_vout; 
    1345     vlc_vld_frame_t *vft = &(p_sys->xxmc_data.vld_frame); 
    1346     picture_t *ff = (picture_t *) vft->forward_reference_picture; 
    1347     picture_t *bf = (picture_t *) vft->backward_reference_picture; 
     1345    vlc_vld_frame_t *vft = &(p_sys->xxmc_data.vld_frame); 
     1346    picture_t *ff         = (picture_t *) vft->forward_reference_picture; 
     1347    picture_t *bf         = (picture_t *) vft->backward_reference_picture; 
    13481348    XvMCMpegControl ctl; 
    13491349    XvMCSurface *fs=0, *bs=0; 
    …… 
    14191419void xvmc_vld_slice( picture_t *picture ) 
    14201420{ 
    1421     vout_sys_t *p_sys     = picture->p_sys; 
     1421    picture_sys_t *p_sys  = picture->p_sys; 
    14221422    vout_thread_t *p_vout = p_sys->p_vout; 
    14231423