summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mkv.c
Commit message (Collapse)AuthorAgeFilesLines
* Fix index-based seeking in audio-only files, fixes bug #621reimar2006-11-051-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20728 b3059339-0415-0410-9bf9-f77b7e298cf2
* add MSGTR_MPDEMUX_MKV for demux_mkv.ckraymer2006-11-051-38/+32
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20696 b3059339-0415-0410-9bf9-f77b7e298cf2
* Libass interface reworked:eugeni2006-10-281-3/+3
| | | | | | | | | - ass_instance_t renamed to ass_renderer_t - ass_library_t introduced - use of mplayer-specific global variables limited to ass_mp.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20493 b3059339-0415-0410-9bf9-f77b7e298cf2
* Implement -noidx since index can use quite a bit of memory, esp. when using ↵reimar2006-10-151-0/+6
| | | | | | valgrind. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20230 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmeticsreimar2006-10-121-5/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20182 b3059339-0415-0410-9bf9-f77b7e298cf2
* strncpy->strlcpyreimar2006-10-121-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20181 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove useless return; at end of functionreimar2006-10-121-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20180 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify demux_mkv_get_sub_langreimar2006-10-121-14/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20179 b3059339-0415-0410-9bf9-f77b7e298cf2
* modifications pointed out by reimar doffingerptt2006-10-121-17/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20174 b3059339-0415-0410-9bf9-f77b7e298cf2
* added OSD audio switching visualizationptt2006-10-111-0/+34
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20162 b3059339-0415-0410-9bf9-f77b7e298cf2
* More possible memleaks.reimar2006-10-111-0/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20161 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid memleak on error while reading attachments or multiplereimar2006-10-111-0/+4
| | | | | | | MATROSKA_ID_FILEDATA parts. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20160 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify (by using realloc with NULL parameter) and refactor code to growreimar2006-10-101-18/+15
| | | | | | | array in 32-increments git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20146 b3059339-0415-0410-9bf9-f77b7e298cf2
* Free track->language before assigning new valuereimar2006-10-091-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20143 b3059339-0415-0410-9bf9-f77b7e298cf2
* Missing (in close function)/misplaced free for track structure itself.reimar2006-10-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20142 b3059339-0415-0410-9bf9-f77b7e298cf2
* Free track data if error occurs while reading trackentryreimar2006-10-091-30/+41
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20141 b3059339-0415-0410-9bf9-f77b7e298cf2
* Free track encodings on error or demuxer closereimar2006-10-091-4/+23
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20139 b3059339-0415-0410-9bf9-f77b7e298cf2
* replace malloc+memset by callocreimar2006-10-091-8/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20136 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove cast of realloc result missed in last patchreimar2006-10-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20135 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unneeded casts for malloc/realloc callsreimar2006-10-091-44/+43
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20134 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add matroska v2 (SimpleBlock) support.eugeni2006-09-251-8/+45
| | | | | | | Patch by Federico Menarini (federico d menarini a gmail d com). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19983 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix r19815: mkv_d->duration could be assigned an uninitialized value.eugeni2006-09-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19818 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix seeking in Matroska files with non-default TimecodeScale value.eugeni2006-09-121-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19817 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix block duration calculation in mkv demuxer.eugeni2006-09-121-0/+1
| | | | | | | According to specs, BlockDuration value is based on TimecodeScale. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19816 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix movie duration calculation in case when TimecodeScale element comes aftereugeni2006-09-121-5/+9
| | | | | | | Duration element. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19815 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix crash on DEMUXER_CTRL_SWITCH_AUDIO introduced by aid_vid_mismatch patchreimar2006-09-031-25/+14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19651 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add support for rendering matroska plaintext subtitles with libass.eugeni2006-09-021-4/+28
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19649 b3059339-0415-0410-9bf9-f77b7e298cf2
* Matroska subtitles are always utf-8, no need to recode them.eugeni2006-09-021-3/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19648 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix read beyond the end of allocated memory block.eugeni2006-09-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19647 b3059339-0415-0410-9bf9-f77b7e298cf2
* Display track names in matroska files.eugeni2006-09-021-1/+25
| | | | | | | Patch by Paul Lebedev _paul d lebedev a gmail d com_. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19646 b3059339-0415-0410-9bf9-f77b7e298cf2
* Extract "application/x-font" attachments from matroska, in additioneugeni2006-09-011-1/+2
| | | | | | | to "application/x-truetype-font". They usually contain Type1 fonts. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19627 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of demux_aid_vid_mismatch mess.reimar2006-08-261-13/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19546 b3059339-0415-0410-9bf9-f77b7e298cf2
* SSA/ASS parser reworked, with 2 main results:eugeni2006-08-221-2/+2
| | | | | | | | support for script embedded fonts (fonts, uuencoded directly into script) added; matroska interface functions have got more sensible names. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19498 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix seeking in matroska files when timecodes do not start from zero.eugeni2006-08-181-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19436 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add matroska chapter seeking capability.eugeni2006-08-061-33/+50
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19348 b3059339-0415-0410-9bf9-f77b7e298cf2
* Native MPEG4 SP/ASP/AP support in Matroska.rathann2006-07-221-0/+13
| | | | | | | Patch by Aurelien Jacobs and myself. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19159 b3059339-0415-0410-9bf9-f77b7e298cf2
* more c++ decl craprfelker2006-07-101-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18989 b3059339-0415-0410-9bf9-f77b7e298cf2
* Initial libass release (without mencoder support).eugeni2006-07-071-3/+200
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18942 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename mkv_sh_sub_t to sh_sub_t, move it to demuxer.h.eugeni2006-07-071-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18939 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a new video pts tracking mode, enabled by option -correct-pts.uau2006-07-061-3/+3
| | | | | | | | | | | | | | This mode has the following differences: - Video timing is correct for streams with B frames, at least with some demuxers. - Video filters can modify frame timestamps and insert new frames, and removing frames is handled better than before. - Some things are known to break, it's not usable as the default yet. Things should work as before when the -correct-pts option is not used. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18922 b3059339-0415-0410-9bf9-f77b7e298cf2
* rm unnecesary casts from void* - part 4reynaldo2006-07-031-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18890 b3059339-0415-0410-9bf9-f77b7e298cf2
* feed any audio track present in the mux; switch to any of the available ↵nicodvb2006-06-191-29/+36
| | | | | | audio tracks git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18757 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change free_sh_audio() to take demuxer and stream id as parametersuau2006-06-141-2/+2
| | | | | | | | | | | | | | (same as new_sh_audio()) instead of sh_audio_t *, use those to remove the pointer from demuxer->a_streams[] before freeing it. Some demuxers use free_sh_audio() to undo the creation of an already-allocated audio stream in case of error. These uses were unsafe since free_sh_audio() freed the data structure but left the pointer in demuxer->a_streams[], leading to double free later in free_demuxer() (and perhaps use of the freed stream before that, I didn't check). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18711 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix potential integer overflows in memory allocation.rtogni2006-06-041-0/+3
| | | | | | | Patch by Rich and me git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18559 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix parsing of vobsub private data, patch by Evgeniy Stepanov <eugeni P ↵gpoirier2006-05-141-0/+1
| | | | | | | | | | | stepanov A gmail P com> Original thread: Date: May 14, 2006 12:28 AM Subject: [MPlayer-dev-eng] [BUG][PATCH] parsing of vobsub private data in mkv probably broken git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18508 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unconditionally compile the Matroska demuxer.diego2006-05-081-3/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18405 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get ride of the several if(identify) messy lines and rearangment of some of ↵reynaldo2006-04-241-12/+5
| | | | | | the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18238 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not give bogus timestamps for laced packets with no default duration. ↵mosu2006-04-241-0/+4
| | | | | | Patch by Uoti Urpala ( uoti ! urpala () pp1 ! inet ! fi ). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18237 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l, keyframes must have tag 0x10, not 1.reimar2006-04-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18097 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix RealAudio codecs (add descrambling)rtognimp2006-04-031-10/+151
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18037 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix for playing RealVideo on PPC/big endian processors. Patch by Emanuele ↵mosu2006-03-221-0/+14
| | | | | | Giaquinta (emanuele ! giaquinta () gmail ! com). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17924 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add audio_delay argument to demux_mkv_seek.corey2006-02-271-3/+3
| | | | | | | Some uspecified amount of sugary caffeineated liquid to me. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17696 b3059339-0415-0410-9bf9-f77b7e298cf2
* Improved handling of text subs in Matroska files with adjacent newlines (\N) ↵mosu2006-01-041-8/+14
| | | | | | resulting in more than SUB_MAX_TEXT lines to display. Patch by Robert Henney (robh () rut ! org). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17309 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unify include path handling, -I.. is in CFLAGS.diego2005-11-181-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17013 b3059339-0415-0410-9bf9-f77b7e298cf2
* sort timestamps instead of assuming conventional B-frame order. (fixes x264 ↵lorenm2005-11-051-6/+14
| | | | | | B-pyramid) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16913 b3059339-0415-0410-9bf9-f77b7e298cf2
* move resync_audio_stream after seeking to demuxer.creimar2005-10-301-8/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16878 b3059339-0415-0410-9bf9-f77b7e298cf2
* Added support for A_AAC.mosu2005-10-221-1/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16825 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use PRI?64 defines as format strings for 64 bit variables.reimar2005-10-131-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16751 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make -identify's 'ID_LENGTH=' print a float and not an integer.. Theods152005-09-021-1/+1
| | | | | | | | accuracey may be totally fake for some demuxers (mpg), but accurate for others.. (avi) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16347 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fixed seeking for AVC-in-Matroska (wrong assumption of what kind of ↵mosu2005-08-241-2/+2
| | | | | | references may be present for a non-I-frame). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16303 b3059339-0415-0410-9bf9-f77b7e298cf2
* Demuxer modularizationrtognimp2005-08-051-10/+27
| | | | | | | Demuxer selection by name with -demuxer command (bakward compatible) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16176 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_stream_t.pts should not be assigned by the demuxer. Fixes playback of ↵mosu2005-06-091-1/+1
| | | | | | VFR files. Patch by Sam Dennis <sam () malfunction ! screaming ! net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15702 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not switch to audio tracks whose codec private data differs from the main ↵mosu2005-05-211-0/+4
| | | | | | audio track's as this will most likely result in messed up audio output. Patch by Michael Behrisch <list () behrisch ! de> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15534 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reset the saved max_pts used for timecode reordering after seeking. ↵mosu2005-05-191-0/+1
| | | | | | Otherwise playback is broken after seeking back in a file that needs the timecodes to be reordered. Patch by Sam Dennis <sam () malfunction ! screaming !net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15518 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed unused variablesnicodvb2005-05-141-5/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15451 b3059339-0415-0410-9bf9-f77b7e298cf2
* vorbis extradata is now passed from demuxer to decoder in matroska's waynicodvb2005-05-121-48/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15421 b3059339-0415-0410-9bf9-f77b7e298cf2
* adds a parameter to the switch_audio command to directly select a track.reimar2005-04-281-10/+21
| | | | | | | Patch by kiriuja mplayer-patches at en-directo net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15286 b3059339-0415-0410-9bf9-f77b7e298cf2
* Online audio switching now supports Matroska too. Patch by Michael Behrischgpoirier2005-04-131-0/+26
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15155 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix the ogg fourcc nightmare!!!rfelker2005-02-271-2/+2
| | | | | | | | | | | | | | | | | The problem: once upon a time, windows idiots decided to try to store vorbis-in-ogg-in-avi. Of course this failed miserably, but they used the audio format tag 0xfffe for "extended" to do this. Later someone working on MPlayer somehow decided 0xfffe was the format for vorbis, which is nonsense, and now that's conflicting with real wav files with extended audio format. This patch changes demux_ogg (and mkv) to use sane fourcc's for vorbis and theora and gets rid of the 0xfffe nonsense so hopefully wav files with extended audio will work now. If there are problems, we'll have to find workarounds...and drive an 18-wheeler full of cola thru the house of whoever wrote this 0xfffe nonsense in MPlayer to begin with... git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14844 b3059339-0415-0410-9bf9-f77b7e298cf2
* Handle missing palettes in the info part of VobSubs in Matroska files ↵mosu2005-01-211-0/+2
| | | | | | 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
* More support for AVC in Matroska.mosu2005-01-161-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14516 b3059339-0415-0410-9bf9-f77b7e298cf2
* set sub_utf8 only when actually using mkv subtitles, will break externalreimar2005-01-161-2/+1
| | | | | | | subtitles (-sub) otherwise. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14514 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move generic length and percent pos calculation to demuxer.creimar2005-01-151-5/+0
| |</