Changeset e42f7d101ca73eb0c38e56bbf61c4483aeb19a4d

Show
Ignore:
Timestamp:
11/08/03 19:31:15 (5 years ago)
Author:
Gildas Bazin <gbazin@videolan.org>
git-committer:
Gildas Bazin <gbazin@videolan.org> 1060623075 +0000
git-parent:

[10b01ed4910dfd1e26e5989818f7d53bd839f9b0]

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

* modules/packetizer/mpegvideo.c: small clarification.
* modules/gui/wxwindows/wxwindows.cpp: don't try to destroy wxWindows objects when wxWindows has already exited.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/wxwindows/wxwindows.cpp

    r48ab498 re42f7d1  
    33 ***************************************************************************** 
    44 * Copyright (C) 2000-2001 VideoLAN 
    5  * $Id: wxwindows.cpp,v 1.29 2003/08/08 16:50:27 gbazin Exp $ 
     5 * $Id: wxwindows.cpp,v 1.30 2003/08/11 17:31:15 gbazin Exp $ 
    66 * 
    77 * Authors: Gildas Bazin <gbazin@netcourrier.com> 
    …… 
    239239    wxEntry( i_args, p_args ); 
    240240#endif 
    241  
    242     if( p_intf->pf_show_dialog ) 
    243     { 
    244         /* We need to manually clean up the dialogs class */ 
    245         if( p_intf->p_sys->p_wxwindow ) delete p_intf->p_sys->p_wxwindow; 
    246     } 
    247241} 
    248242 

  • modules/packetizer/mpegvideo.c

    r10b01ed re42f7d1  
    33 ***************************************************************************** 
    44 * Copyright (C) 2001, 2002 VideoLAN 
    5  * $Id: mpegvideo.c,v 1.16 2003/08/10 22:13:05 fenrir Exp $ 
     5 * $Id: mpegvideo.c,v 1.17 2003/08/11 17:31:15 gbazin Exp $ 
    66 * 
    77 * Authors: Laurent Aimar <fenrir@via.ecp.fr> 
    …… 
    511511        /* Trivial case (DTS == PTS) */ 
    512512        p_pack->i_interpolated_dts += i_duration; 
    513         p_sout_buffer->i_length = i_duration; 
    514513    } 
    515514    else 
    516515    { 
    517516        p_pack->i_interpolated_dts += p_pack->i_old_duration; 
    518         p_sout_buffer->i_length = p_pack->i_old_duration; 
    519517        p_pack->i_old_duration = i_duration; 
    520518    } 
    521519 
     520    p_sout_buffer->i_length = p_pack->p_pack->i_interpolated_dts - 
     521                                p_sout_buffer->i_dts; 
     522 
    522523    p_sout_buffer->i_bitrate = (int)( 8 * i_pos * p_pack->d_frame_rate ); 
     524 
    523525#if 0 
    524526    msg_Dbg( p_pack->p_fifo, "------------> dts=%lld pts=%lld duration=%lld",