Changeset e5e9c9447c8408cc6ab9b7aec3478464ebe25a8b

Show
Ignore:
Timestamp:
05/06/05 20:07:08 (3 years ago)
Author:
Gildas Bazin <gbazin@videolan.org>
git-committer:
Gildas Bazin <gbazin@videolan.org> 1117994828 +0000
git-parent:

[e46cef82d6b7c9ef2dfebc07db8989fcf7a524cc]

git-author:
Gildas Bazin <gbazin@videolan.org> 1117994828 +0000
Message:

* modules/access/dvdnav.c,dvdread.c: don't crash if the DVD can't be decrypted/read.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/access/dvdnav.c

    re46cef8 re5e9c94  
    293293        if( dvdnav_title_play( p_sys->dvdnav, 1 ) != DVDNAV_STATUS_OK ) 
    294294        { 
    295             msg_Warn( p_demux, "cannot set title" ); 
     295            msg_Err( p_demux, "cannot set title (can't decrypt DVD?)" ); 
     296            dvdnav_close( p_sys->dvdnav ); 
     297            free( p_sys ); 
     298            return VLC_EGENERIC; 
    296299        } 
    297300 

  • modules/access/dvdread.c

    rf7bc314 re5e9c94  
    264264 
    265265    DemuxTitles( p_demux, &p_sys->i_angle ); 
    266     DvdReadSetArea( p_demux, 0, 0, p_sys->i_angle ); 
     266    if( DvdReadSetArea( p_demux, 0, 0, p_sys->i_angle ) != VLC_SUCCESS ) 
     267    { 
     268        Close( p_this ); 
     269        msg_Err( p_demux, "DvdReadSetArea(0,0,%i) failed (can't decrypt DVD?)", 
     270                 p_sys->i_angle ); 
     271        return VLC_EGENERIC; 
     272    } 
    267273 
    268274    /* Update default_pts to a suitable value for dvdread access */