~ubuntu-branches/ubuntu/trusty/mkvtoolnix/trusty

« back to all changes in this revision

Viewing changes to src/input/r_mpeg_ts.h

Committer: Package Import Robot
Author(s): Christian Marillat
Date: 2013-01-21 09:04:27 UTC
mfrom: (1.1.18) (4.2.26 sid)
Revision ID: package-import@ubuntu.com-20130121090427-5c9d0gyf2807ju9d

Tags: 6.0.0-1

New upstream release.

files added:
src/common/amf.cpp

src/common/amf.h

src/common/caf.h

src/common/fourcc.cpp

src/common/fourcc.h

src/common/mm_io_x.cpp

src/common/mm_io_x.h

src/common/opus.cpp

src/common/opus.h

src/extract/xtr_alac.cpp

src/extract/xtr_alac.h

src/output/p_opus.cpp

src/output/p_opus.h

tests/test-377mp3_skip_id3_properly.rb

tests/test-378deprecated_iso_639_2_codes.rb

tests/test-379flv.rb

tests/test-380split_frames.rb

tests/test-381X_alac.rb

tests/test-382split_chapters.rb

tests/test-383mp4_text_track_subtitles.rb

tests/test-384vobsub_in_mp4.rb

tests/test-385split_parts_frames.rb

tests/unit/common/fourcc.cpp

files removed:
.pc/fix_desktop_files.patch

.pc/fix_desktop_files.patch/share

.pc/fix_desktop_files.patch/share/desktop

.pc/fix_desktop_files.patch/share/desktop/mkvinfo.desktop

.pc/fix_desktop_files.patch/share/desktop/mkvmergeGUI.desktop

debian/patches

debian/patches/fix_desktop_files.patch

debian/patches/series

lib/lib.proj

lib/librmff/librmff.proj

lib/utf8-cpp/utf8-cpp.proj

mkvtoolnix.proj

src/mpegparser/mpegparser.proj

src/src.proj

files modified:
.gitignore

.gitmodules

.pc/applied-patches

ChangeLog

README

README.Windows.txt

Rakefile

ac/boost.m4

ac/build_timestamp_in_version.m4

ac/debugging_profiling.m4

ac/precompiled_headers.m4

autom4te.cache/output.0

autom4te.cache/requests

autom4te.cache/traces.0

config.guess

config.h.in

config.sub

configure

configure.in

contrib/fedora-core.spec

contrib/opensuse-12.spec

debian-upstream/changelog

debian-upstream/watch

debian/changelog

doc/man/ja/mkvextract.1

doc/man/ja/mkvinfo.1

doc/man/ja/mkvmerge.1

doc/man/ja/mkvpropedit.1

doc/man/ja/mmg.1

doc/man/mkvextract.1

doc/man/mkvextract.xml

doc/man/mkvinfo.1

doc/man/mkvinfo.xml

doc/man/mkvmerge.1

doc/man/mkvmerge.xml

doc/man/mkvpropedit.1

doc/man/mkvpropedit.xml

doc/man/mkvtoolnix-gui.xml

doc/man/mmg.1

doc/man/mmg.xml

doc/man/nl/mkvextract.1

doc/man/nl/mkvinfo.1

doc/man/nl/mkvmerge.1

doc/man/nl/mkvpropedit.1

doc/man/nl/mmg.1

doc/man/po4a/po/ja.po

doc/man/po4a/po/nl.po *

doc/man/po4a/po/uk.po

doc/man/po4a/po/zh_CN.po

doc/man/uk/mkvextract.1

doc/man/uk/mkvinfo.1

doc/man/uk/mkvmerge.1

doc/man/uk/mkvpropedit.1

doc/man/uk/mmg.1

doc/man/zh_CN/mkvextract.1

doc/man/zh_CN/mkvinfo.1

doc/man/zh_CN/mkvmerge.1

doc/man/zh_CN/mkvpropedit.1

doc/man/zh_CN/mmg.1

installer/mkvtoolnix-unicode.nsi

lib/libebml/ebml/EbmlDate.h

po/cs.po

po/de.po

po/es.po *

po/eu.po

po/fr.po *

po/it.po

po/ja.po

po/lt.po *

po/nl.po *

po/pl.po *

po/ru.po

po/tr.po

po/uk.po

po/zh_CN.po

po/zh_TW.po

rake.d/gtest.rb

src/common/alac.h

src/common/bit_cursor.h

src/common/byte_buffer.h

src/common/chapters/chapters.cpp

src/common/chapters/chapters.h

src/common/command_line.cpp

src/common/ebml.h

src/common/file_types.cpp

src/common/iso639.cpp

src/common/kax_analyzer.cpp

src/common/kax_analyzer.h

src/common/logger.cpp

src/common/math.cpp

src/common/math.h

src/common/matroska.h

src/common/mm_io.cpp

src/common/mm_io.h

src/common/mm_io_win.cpp

src/common/mm_multi_file_io.cpp

src/common/mm_read_buffer_io.cpp

src/common/mm_write_buffer_io.cpp

src/common/mp3.cpp

src/common/mpeg4_p10.cpp

src/common/mpeg4_p10.h

src/common/output.cpp

src/common/property_element.cpp

src/common/translation.h

src/common/version.cpp

src/common/xml/ebml_chapters_converter.cpp

src/common/xml/ebml_chapters_converter.h

src/common/xml/ebml_converter.cpp

src/common/xml/ebml_segmentinfo_converter.cpp

src/common/xml/ebml_tags_converter.cpp

src/common/xml/ebml_tags_converter.h

src/common/xml/xml.cpp

src/extract/attachments.cpp

src/extract/chapters.cpp

src/extract/cuesheets.cpp

src/extract/extract_cli_parser.cpp

src/extract/resources.rc

src/extract/tags.cpp

src/extract/timecodes_v2.cpp

src/extract/tracks.cpp

src/extract/xtr_avi.cpp

src/extract/xtr_base.cpp

src/extract/xtr_rmff.cpp

src/extract/xtr_textsubs.cpp

src/extract/xtr_tta.cpp

src/extract/xtr_vobsub.cpp

src/extract/xtr_wav.cpp

src/info/mkvinfo.cpp

src/info/resources.rc

src/input/qtmp4_atoms.h

src/input/r_aac.h

src/input/r_ac3.h

src/input/r_avc.h

src/input/r_avi.h

src/input/r_coreaudio.cpp

src/input/r_coreaudio.h

src/input/r_dirac.h

src/input/r_dts.h

src/input/r_flac.h

src/input/r_flv.cpp *

src/input/r_flv.h *

src/input/r_ivf.h

src/input/r_matroska.cpp

src/input/r_matroska.h

src/input/r_microdvd.cpp

src/input/r_mp3.cpp

src/input/r_mp3.h

src/input/r_mpeg_es.cpp

src/input/r_mpeg_es.h

src/input/r_mpeg_ps.h

src/input/r_mpeg_ts.h

src/input/r_ogm.cpp

src/input/r_ogm.h

src/input/r_pgssup.h

src/input/r_qtmp4.cpp

src/input/r_qtmp4.h

src/input/r_real.h

src/input/r_srt.h

src/input/r_ssa.h

src/input/r_truehd.cpp

src/input/r_truehd.h

src/input/r_tta.h

src/input/r_usf.cpp

src/input/r_usf.h

src/input/r_vc1.h

src/input/r_vobbtn.h

src/input/r_vobsub.h

src/input/r_wav.h

src/input/r_wavpack.h

src/merge/cluster_helper.cpp

src/merge/cluster_helper.h

src/merge/mkvmerge.cpp

src/merge/mkvmerge.h

src/merge/output_control.cpp

src/merge/output_control.h

src/merge/pr_generic.cpp

src/merge/pr_generic.h

src/merge/resources.rc

src/mkvtoolnix-gui/resources.rc

src/mmg/cli_options_dlg.cpp

src/mmg/cli_options_dlg.h

src/mmg/helpers.cpp

src/mmg/mmg.h

src/mmg/mmg_dialog.cpp

src/mmg/mmg_dialog.h

src/mmg/mux_dialog.cpp

src/mmg/options/mmg.cpp

src/mmg/options/mmg.h

src/mmg/resources.rc

src/mmg/tabs/chapters.cpp

src/mmg/tabs/chapters.h

src/mmg/tabs/global.cpp

src/mmg/tabs/global.h

src/mmg/tabs/input.cpp

src/mpegparser/M2VParser.cpp

src/mpegparser/M2VParser.h

src/output/p_aac.h

src/output/p_ac3.cpp

src/output/p_ac3.h

src/output/p_alac.h

src/output/p_avc.cpp

src/output/p_avc.h

src/output/p_dirac.cpp

src/output/p_dirac.h

src/output/p_dts.cpp

src/output/p_dts.h

src/output/p_flac.h

src/output/p_kate.h

src/output/p_mp3.cpp

src/output/p_mp3.h

src/output/p_mpeg1_2.h

src/output/p_mpeg4_p10.cpp

src/output/p_mpeg4_p10.h

src/output/p_mpeg4_p2.h

src/output/p_passthrough.h

src/output/p_pcm.h

src/output/p_pgs.h

src/output/p_realaudio.h

src/output/p_textsubs.h

src/output/p_theora.h

src/output/p_truehd.h

src/output/p_tta.h

src/output/p_vc1.h

src/output/p_video.h

src/output/p_vobbtn.h

src/output/p_vobsub.h

src/output/p_vorbis.h

src/output/p_vp8.h

src/output/p_wavpack.h

src/propedit/attachment_target.cpp

src/propedit/propedit.cpp

src/propedit/resources.rc

src/propedit/tag_target.cpp

src/tools/base64tool.cpp

tests/results.txt

tests/unit/common/ebml_chapters_converter.cpp

tests/unit/common/ebml_segmentinfo_converter.cpp

tests/unit/common/ebml_tags_converter.cpp

tests/unit/common/mm_io.cpp

Show diffs side-by-side

added added

removed removed

src/input/r_mpeg_ts.h

283

bool v_interlaced;

284

int v_version, v_width, v_height, v_dwidth, v_dheight;

285

double v_frame_rate, v_aspect_ratio;

286

memory_cptr v_avcc, raw_seq_hdr;

286

memory_cptr raw_seq_hdr;

287

288

// audio related parameters

289

int a_channels, a_sample_rate, a_bits_per_sample, a_bsid;

385

386

static bool probe_file(mm_io_c *in, uint64_t size);

387

388

virtual const std::string get_format_name(bool translate = true) const {

389

return translate ? Y("MPEG transport stream") : "MPEG transport stream";

388

virtual translatable_string_c get_format_name() const {

389

return YT("MPEG transport stream");

390

}

391

392

virtual void read_headers();

Older »