← Back to branch summary

~ubuntu-branches/ubuntu/natty/vlc/natty

« back to all changes in this revision

Viewing changes to modules/demux/mkv/Ebml_parser.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2010-07-23 10:41:59 UTC
  • mfrom: (1.1.31 upstream)
  • Revision ID: james.westby@ubuntu.com-20100723104159-pudrtu70a1svhiyl
Tags: 1.1.1-1+exp1ubuntu1
* Merge from Debian experimental, remaining changes:
  - build and install the libx264 plugin
  - add Xb-Npp header to vlc package
  - Add apport hook to include more vlc dependencies in bug reports

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/demux/mkv/Ebml_parser.cpp
3
3
 * mkv.cpp : matroska demuxer
4
4
 *****************************************************************************
5
5
 * Copyright (C) 2003-2004 the VideoLAN team
6
 
 * $Id: 5feafdf4bb3e631d92fbb57964fe47c8c2d4e9f4 $
 
6
 * $Id: aeec50d13dab90597ac31bf254653343a15b46fd $
7
7
 *
8
8
 * Authors: Laurent Aimar <fenrir@via.ecp.fr>
9
9
 *          Steve Lhomme <steve.lhomme@free.fr>
48
48
 
49
49
EbmlParser::~EbmlParser( void )
50
50
{
 
51
    if( !mi_level )
 
52
    {
 
53
        assert( !mb_keep );
 
54
        delete m_el[1];
 
55
        return;
 
56
    }
 
57
 
51
58
    int i;
52
59
 
53
60
    for( i = 1; i < mi_level; i++ )