~ubuntu-branches/ubuntu/wily/mkvtoolnix/wily

« back to all changes in this revision

Viewing changes to src/input/r_microdvd.cpp

  • Committer: Package Import Robot
  • Author(s): Christian Marillat
  • Date: 2015-04-26 10:36:27 UTC
  • mfrom: (1.1.29) (4.2.45 sid)
  • Revision ID: package-import@ubuntu.com-20150426103627-k53p8hrai2ynikaa
Tags: 7.8.0-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
   mkvmerge -- utility for splicing together matroska files
3
3
   from component media subtypes
4
4
 
5
 
   Distributed under the GPL
 
5
   Distributed under the GPL v2
6
6
   see the file COPYING for details
7
7
   or visit http://www.gnu.org/copyleft/gpl.html
8
8
 
14
14
#include "common/common_pch.h"
15
15
 
16
16
#include "common/mm_io_x.h"
 
17
#include "common/strings/formatting.h"
17
18
#include "input/r_microdvd.h"
 
19
#include "merge/id_result.h"
18
20
 
19
21
int
20
22
microdvd_reader_c::probe_file(mm_text_io_c *in,