Changeset b6cdf137040a4c01b2340eb921a3509c4133a930

Show
Ignore:
Timestamp:
10/04/08 20:01:51 (6 months ago)
Author:
Jean-Paul Saman <jpsaman@videolan.org>
git-committer:
Jean-Paul Saman <jpsaman@videolan.org> 1207850511 +0200
git-parent:

[35b0ece9c5d3b51728010eed05f91ef0793b5dae]

git-author:
Jean-Paul Saman <jpsaman@videolan.org> 1207850511 +0200
Message:

Properly detect XvMC capabilities.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/video_output/x11/xcommon.c

    r78e39f0 rb6cdf13  
    427427    msg_Dbg(p_vout, "Crop = %d", p_vout->p_sys->xvmc_crop_style); 
    428428 
    429     if( !checkXvMCCap( p_vout ) ) 
     429    if( checkXvMCCap( p_vout ) == VLC_EGENERIC ) 
    430430    { 
    431431        msg_Err( p_vout, "no XVMC capability found" ); 

  • modules/video_output/x11/xvmc.c

    r35b0ece rb6cdf13  
    746746 
    747747    /* 
    748     * Try to create a direct rendering context. This will fail if we are not 
    749     * on the displaying computer or an indirect context is not available. 
    750     */ 
     748    * Try to create a direct rendering context. This will fail if we are not 
     749    * on the displaying computer or an indirect context is not available. 
     750    */ 
    751751    XVMCUNLOCKDISPLAY( p_vout->p_sys->p_display ); 
    752752    curCap = p_vout->p_sys->xvmc_cap; 
    …… 
    755755                                      curCap->max_width, 
    756756                                      curCap->max_height, 
    757                                       XVMC_DIRECT, &c) ) 
    758     { 
    759             p_vout->p_sys->context_flags = XVMC_DIRECT; 
     757                                      XVMC_DIRECT, &c ) ) 
     758    { 
     759        msg_Dbg( p_vout, "using direct XVMC rendering context" ); 
     760        p_vout->p_sys->context_flags = XVMC_DIRECT; 
    760761    } 
    761762    else if( Success == XvMCCreateContext( p_vout->p_sys->p_display, i_xvport, 
    …… 
    763764                                           curCap->max_width, 
    764765                                           curCap->max_height, 
    765                                            0, &c) ) 
    766     { 
     766                                           0, &c ) ) 
     767    { 
     768        msg_Dbg( p_vout, "using default XVMC rendering context" ); 
    767769        p_vout->p_sys->context_flags = 0; 
    768770    }