summaryrefslogtreecommitdiffstats
path: root/libmpdemux/matroska.h
Commit message (Collapse)AuthorAgeFilesLines
* Rename directories, move files (step 1 of 2) (does not compile)wm42012-11-121-86/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tis drops the silly lib prefixes, and attempts to organize the tree in a more logical way. Make the top-level directory less cluttered as well. Renames the following directories: libaf -> audio/filter libao2 -> audio/out libvo -> video/out libmpdemux -> demux Split libmpcodecs: vf* -> video/filter vd*, dec_video.* -> video/decode mp_image*, img_format*, ... -> video/ ad*, dec_audio.* -> audio/decode libaf/format.* is moved to audio/ - this is similar to how mp_image.* is located in video/. Move most top-level .c/.h files to core. (talloc.c/.h is left on top- level, because it's external.) Park some of the more annoying files in compat/. Some of these are relicts from the time mplayer used ffmpeg internals. sub/ is not split, because it's too much of a mess (subtitle code is mixed with OSD display and rendering). Maybe the organization of core is not ideal: it mixes playback core (like mplayer.c) and utility helpers (like bstr.c/h). Should the need arise, the playback core will be moved somewhere else, while core contains all helper and common code.
* demux_mkv: TTA supportKovensky2012-11-081-0/+1
| | | | | | | | | | | | | | | | | Code from libavformat's demuxer. Merged by wm4. It looks like the byte stream writer API is private in newer ffmpeg, so use the macros from <libavutil/intreadwrite.h> instead. It's not really known how to correctly set the field that is used by the decoder to calculate the length of the last frame. The original patch used: put_le32(&b, (demuxer->movi_end - demuxer->movi_start) * sh_a->samplerate); This doesn't seem to be correct. Write 0 instead. This is also incorrect, but better than writing an essentially random value.
* demux_mkv: support Blu-ray subtitlesUoti Urpala2011-03-311-0/+1
| | | | Recognize "S_HDMV/PGS" CodecID.
* demux_mkv: support E-AC-3 audioUoti Urpala2011-03-311-0/+1
| | | | Recognize "A_EAC3" CodecID.
* demux_mkv: support V_MJPEG video tagUoti Urpala2010-10-271-0/+1
|
* demux_mkv: support VP8 video tagUoti Urpala2010-05-301-0/+1
|
* Add Dolby TrueHD support for mkv demuxer.cehoyos2009-08-131-0/+1
| | | | | | | Patch by Jason Tackaberry, tack urandom ca git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29513 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add standard license header to all files in libmpdemux.diego2009-05-081-0/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29280 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unnecessary includesuau2008-04-011-4/+0
| | | | | | | | | | command.c: Don't include libmpcodecs/mp_image.h, libmpdemux/matroska.h mplayer.c: Don't include libmpdemux/matroska.h matroska.h: Remove declaration of already removed function demux_mkv_change_subs and stop including demuxer.h git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26313 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing header #includes to fix 'make checkheaders'.diego2008-03-051-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26175 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fill sh_sub_t.lang in lavf, mkv and ogg demuxers. Use it for printing subtitleeugeni2008-02-291-2/+0
| | | | | | | track language. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26116 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fill sh_audio_t.lang in lavf and mkv demuxers. Use it for printing audio trackeugeni2008-02-291-2/+0
| | | | | | | language when available. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26115 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add MPLAYER_ prefix to multiple inclusion guards.diego2008-02-221-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
* add support for wavpack into matroskaaurel2007-10-211-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24833 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not use leading underscores in multiple inclusion guards, they are reserved.diego2007-07-021-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23709 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove useless demnuxer.h include from matroska.h, it creats "hundreds" ofreimar2007-06-201-2/+0
| | | | | | | "warning: redundant redeclaration" git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23590 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support theora in mkv. Sample: http://samples.mplayerhq.hu/Matroska/theora.mkvreimar2007-05-101-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23289 b3059339-0415-0410-9bf9-f77b7e298cf2
* Generalize subtitle switching, demux_ogg does not need a special casereimar2006-11-191-1/+0
| | | | | | | anymore and demux_mov works now, too. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21054 b3059339-0415-0410-9bf9-f77b7e298cf2
* added OSD audio switching visualizationptt2006-10-111-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20162 b3059339-0415-0410-9bf9-f77b7e298cf2
* Native MPEG4 SP/ASP/AP support in Matroska.rathann2006-07-221-0/+3
| | | | | | | Patch by Aurelien Jacobs and myself. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19159 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename mkv_sh_sub_t to sh_sub_t, move it to demuxer.h.eugeni2006-07-071-10/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18939 b3059339-0415-0410-9bf9-f77b7e298cf2
* Added support for A_AAC.mosu2005-10-221-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16825 b3059339-0415-0410-9bf9-f77b7e298cf2
* Handle missing palettes in the info part of VobSubs in Matroska files ↵mosu2005-01-211-0/+1
| | | | | | correctly by giving mplayer a NULL pointer. This way it will use a default palette instead of black only. Patch by Csillag Kristof (fenwick () freemail ! hu) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14562 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support for AVC in Matroska.mosu2005-01-111-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14459 b3059339-0415-0410-9bf9-f77b7e298cf2
* Added support for MPEG-1 and MPEG-2 in Matroska.mosu2004-11-261-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14055 b3059339-0415-0410-9bf9-f77b7e298cf2
* Display the language code for subtitles from Matroska files.mosu2004-08-241-2/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13130 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support for subtitle switching in Matroska.mosu2004-08-241-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13127 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support for the "custom colors" and "forced subtitles" entries in the VobSub ↵mosu2004-06-101-0/+3
| | | | | | idx. Made the parser handle whitespaces better. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12551 b3059339-0415-0410-9bf9-f77b7e298cf2
* Added the new C based Matroska demuxer by Aurelien Jacobs.mosu2004-01-191-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11808 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support for HE-AAC in Matroska. Also only set ds->pts to the first pts of a ↵mosu2003-12-051-1/+2
| | | | | | laced block, and set dp->pts to the current pts taking default_duration into account. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11558 b3059339-0415-0410-9bf9-f77b7e298cf2
* Added the FLAC CodecId.mosu2003-11-161-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11487 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support for MP2 audio.mosu2003-10-161-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11156 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support for VobSub-in-Matroska; parts outside of demux_mkv.cpp.mosu2003-10-161-0/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11154 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support for SSA text subs in Matroska. Patch partially by Tristan ↵mosu2003-09-101-2/+3
| | | | | | <z80@oceanfree.net>. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10846 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support for Quicktime stuff in Matroska (e.g. Sorenson, QDesign Music codecs ↵mosu2003-09-101-0/+8
| | | | | | etc.). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10845 b3059339-0415-0410-9bf9-f77b7e298cf2
* Necessary changes for the upcoming libebml/libmatroska 0.5.0. Implemented ↵mosu2003-07-111-0/+9
| | | | | | support for RealAudio and RealVideo inside Matroska. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10411 b3059339-0415-0410-9bf9-f77b7e298cf2
* Endian fixes and proper support for headerless AAC streams.mosu2003-05-191-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10134 b3059339-0415-0410-9bf9-f77b7e298cf2
* Added support for AAC.mosu2003-05-171-1/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10126 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support for DTS tracks (only with -hwac3 of course).mosu2003-05-151-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10106 b3059339-0415-0410-9bf9-f77b7e298cf2
* Added Matroska demuxing support.mosu2003-04-301-0/+21
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10025 b3059339-0415-0410-9bf9-f77b7e298cf2