~ubuntu-branches/ubuntu/utopic/vlc/utopic

« back to all changes in this revision

Viewing changes to modules/demux/mkv/demux.hpp

  • Committer: Package Import Robot
  • Author(s): Benjamin Drung
  • Date: 2012-02-18 01:29:48 UTC
  • mfrom: (1.1.45) (3.5.32 sid)
  • Revision ID: package-import@ubuntu.com-20120218012948-tvq9nhnfi98kra44
Tags: 2.0.0-1
* New upstream release (Closes: #499381, #573064, #624027, LP: #455825,
  #573775, #695882, #705151, #708448, #738381, #743581, #747757, #817924,
  #931083).
* Remove dropped mozilla-plugin-vlc, vlc-plugin-ggi, and vlc-plugin-svgalib.
  The Mozilla browser plug-in is now provided by a separate source tarball.
* Add new plugins to and remove dropped plugins from vlc-nox.
* Add new and remove dropped build dependencies:
  + libbluray-dev (for Blu-ray support)
  + libresid-builder-dev
  + libsamplerate0-dev
  + libsidplay2-dev
  + lbspeexdsp-dev
  + libxcb-composite0-dev
  - libgtk2.0-dev
  - xulrunner-dev
* vlc-plugin-fluidsynth depends on fluid-soundfont-gm or
  musescore-soundfont-gm for having a sound font for playing MIDI files.
* Drop all patches (they were either backported or accepted by upstream).
* Update symbols for libvlc5.
* Install plugins.dat instead of running vlc-cache-gen in postinst.
* Update minimum version of build dependencies.
* Change Build-Dependency from libupnp3-dev to unversioned libupnp-dev.
  (Closes: #656831)

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
 * mkv.cpp : matroska demuxer
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2003-2004 the VideoLAN team
5
 
 * $Id: db72f5d9e084185d1e3edd7f86e6690c80e16291 $
 
5
 * $Id: ce7c966a8e28950b8cf7bc8e7eaf8ecc39f996d1 $
6
6
 *
7
7
 * Authors: Laurent Aimar <fenrir@via.ecp.fr>
8
8
 *          Steve Lhomme <steve.lhomme@free.fr>
332
332
    demux_sys_t( demux_t & demux )
333
333
        :demuxer(demux)
334
334
        ,i_pts(0)
 
335
        ,i_pcr(0)
335
336
        ,i_start_pts(0)
336
337
        ,i_chapter_time(0)
337
338
        ,meta(NULL)
351
352
    demux_t                 & demuxer;
352
353
 
353
354
    mtime_t                 i_pts;
 
355
    mtime_t                 i_pcr;
354
356
    mtime_t                 i_start_pts;
355
357
    mtime_t                 i_chapter_time;
356
358