Changeset 48ab4989596b30c06377d605c78bd0612b6b0c86

Show
Ignore:
Timestamp:
08/08/03 18:50:27 (5 years ago)
Author:
Gildas Bazin <gbazin@videolan.org>
git-committer:
Gildas Bazin <gbazin@videolan.org> 1060361427 +0000
git-parent:

[417b4c294f372b1f31bd273a3a91af87535edaed]

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

* src/input/input_clock.c: reverted the patch that caused the regression in 0.6.1
* modules/packetizer/copy.c: fixed segfault
* modules/gui/wxwindows/wxwindows.cpp: compilation fix for wxWindows 2.5 cvs

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/wxwindows/wxwindows.cpp

    r53f8728 r48ab498  
    33 ***************************************************************************** 
    44 * Copyright (C) 2000-2001 VideoLAN 
    5  * $Id: wxwindows.cpp,v 1.28 2003/07/29 21:14:10 gbazin Exp $ 
     5 * $Id: wxwindows.cpp,v 1.29 2003/08/08 16:50:27 gbazin Exp $ 
    66 * 
    77 * Authors: Gildas Bazin <gbazin@netcourrier.com> 
    …… 
    224224 
    225225    /* Hack to pass the p_intf pointer to the new wxWindow Instance object */ 
     226#ifdef wxTheApp 
     227    wxApp::SetInstance( new Instance( p_intf ) ); 
     228#else 
    226229    wxTheApp = new Instance( p_intf ); 
     230#endif 
    227231 
    228232#if defined( WIN32 ) 

  • modules/packetizer/copy.c

    r80a68e4 r48ab498  
    33 ***************************************************************************** 
    44 * Copyright (C) 2001, 2002 VideoLAN 
    5  * $Id: copy.c,v 1.12 2003/07/31 19:02:23 fenrir Exp $ 
     5 * $Id: copy.c,v 1.13 2003/08/08 16:50:27 gbazin Exp $ 
    66 * 
    77 * Authors: Laurent Aimar <fenrir@via.ecp.fr> 
    …… 
    9494{ 
    9595    packetizer_thread_t *p_pack; 
    96  
    97     msg_Dbg( p_fifo, "Running copy packetizer (fcc=%4.4s)", (char*)&p_fifo->i_fourcc ); 
     96    int i_ret; 
     97 
     98    msg_Dbg( p_fifo, "Running copy packetizer (fcc=%4.4s)", 
     99             (char*)&p_fifo->i_fourcc ); 
    98100 
    99101    p_pack = malloc( sizeof( packetizer_thread_t ) ); 
    …… 
    118120    } 
    119121 
     122    i_ret = p_pack->p_fifo->b_error ? VLC_EGENERIC : VLC_SUCCESS; 
    120123    End( p_pack ); 
    121124 
    122     return( p_pack->p_fifo->b_error ? VLC_EGENERIC : VLC_SUCCESS ); 
     125    return( i_ret ); 
    123126} 
    124127 

  • src/input/input_clock.c

    rbf73ff6 r48ab498  
    33 ***************************************************************************** 
    44 * Copyright (C) 1999-2001 VideoLAN 
    5  * $Id: input_clock.c,v 1.40 2003/08/01 00:05:07 gbazin Exp $ 
     5 * $Id: input_clock.c,v 1.41 2003/08/08 16:50:27 gbazin Exp $ 
    66 * 
    77 * Authors: Christophe Massiot <massiot@via.ecp.fr> 
    …… 
    9898        i_sysdate /= 1000; 
    9999        i_sysdate += (mtime_t)p_pgrm->sysdate_ref; 
    100  
    101         if ( i_sysdate < mdate() - CR_MAX_GAP 
    102                || i_sysdate > mdate() + CR_MAX_GAP ) 
    103         { 
    104             msg_Warn( p_input, "Bogus clock encountered, resetting" ); 
    105             ClockNewRef( p_pgrm, i_clock, i_sysdate = mdate() ); 
    106         } 
    107100    } 
    108101 
    …… 
    236229    } 
    237230 
    238     if( ( p_pgrm->i_synchro_state != SYNCHRO_OK ) || ( i_clock == 0 ) ) 
     231    if( ( p_pgrm->i_synchro_state != SYNCHRO_OK ) || 
     232        ( i_clock == 0 && p_pgrm->last_cr != 0 ) ) 
    239233    { 
    240234        /* Feed synchro with a new reference point. */ 
    241235        ClockNewRef( p_pgrm, i_clock, 
    242                      i_clock == 0 ? mdate() : 
    243236                     p_pgrm->last_pts + CR_MEAN_PTS_GAP > mdate() ? 
    244237                     p_pgrm->last_pts + CR_MEAN_PTS_GAP : mdate() );