Changeset 8eb693be216b7b1816b224067a6813ac035555cf

Show
Ignore:
Timestamp:
14/12/07 21:09:07 (10 months ago)
Author:
Antoine Cellerier <dionoea@videolan.org>
git-committer:
Antoine Cellerier <dionoea@videolan.org> 1197662947 +0000
git-parent:

[7d6fd3cca9961a90e87414b49cae5253b4dec2e0]

git-author:
Antoine Cellerier <dionoea@videolan.org> 1197662947 +0000
Message:

[PATCH] Extend pvr support to non-ivtv v4l2 cards (e.g. cx88-blackbird) by Dennis Lou.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/access/pvr.c

    r6b822f3 r8eb693b  
    842842    if( result < 0 ) 
    843843    { 
    844         msg_Err( p_access, "unknown ivtv driver version in use" ); 
     844        msg_Err( p_access, "unknown ivtv/pvr driver version in use" ); 
    845845        Close( VLC_OBJECT(p_access) ); 
    846846        return VLC_EGENERIC; 
    847847    } 
    848848 
    849     msg_Dbg( p_access, "ivtv driver version %02x.%02x.%02x", 
     849    msg_Dbg( p_access, "%s driver (%s on %s) version %02x.%02x.%02x", 
     850              device_capability.driver, 
     851              device_capability.card, 
     852              device_capability.bus_info, 
    850853            ( device_capability.version >> 16 ) & 0xff, 
    851854            ( device_capability.version >>  8 ) & 0xff, 
    852855            ( device_capability.version       ) & 0xff); 
    853856 
    854     if ( device_capability.version >= 0x000800 ) 
     857    if ( strncmp( (char *) device_capability.driver, "ivtv", 4 ) 
     858           || device_capability.version >= 0x000800 ) 
    855859    { 
    856860        /* Drivers > 0.8.0 use v4l2 API instead of IVTV ioctls */