summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mkv.c
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14503 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not access word-sized elements on potentially unaligned memory addresses. ↵mosu2005-01-131-1/+1
| | | | | | RISC processors usually do not like that. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14490 b3059339-0415-0410-9bf9-f77b7e298cf2
* Call subcp_close when closing the demuxerreimar2005-01-111-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14462 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support for AVC in Matroska.mosu2005-01-111-0/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14459 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make use of the default duration for one frame if it is present in the file. ↵mosu2004-11-281-0/+3
| | | | | | This produces much smoother timecodes for laced audio frames. And I REALLY don't know why I missed that before... git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14059 b3059339-0415-0410-9bf9-f77b7e298cf2
* Added support for MPEG-1 and MPEG-2 in Matroska.mosu2004-11-261-4/+135
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14055 b3059339-0415-0410-9bf9-f77b7e298cf2
* Output more information about vids, aids, sids, alangs and slangs with ↵mosu2004-11-251-0/+15
| | | | | | -identify. Patch by kiriuja <mplayer-patches@en-directo.net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14047 b3059339-0415-0410-9bf9-f77b7e298cf2
* DTS uses the format tag 0x2001. Patch by Joakim Plate (joakim ! plate () ↵mosu2004-10-301-3/+5
| | | | | | ecce ! se) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13805 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix sub_select fiasco with global sub numbering. now multiple sub sources ↵joey2004-09-281-0/+20
| | | | | | can be managed in essentially one list. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13502 b3059339-0415-0410-9bf9-f77b7e298cf2
* With the latest change to dec_audio.c (1.32) the demuxers have to set ↵mosu2004-09-211-10/+10
| | | | | | sh_a->samplesize to something != 0. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13425 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix playback of files with displaysize not set (aspect was set to NaN for these)reimar2004-09-181-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13382 b3059339-0415-0410-9bf9-f77b7e298cf2
* Spelling. Patch by Jan Minar <jjminar at fastmail onedot fm>.mosu2004-09-121-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13325 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: fix some compiler warnings.mosu2004-08-251-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13132 b3059339-0415-0410-9bf9-f77b7e298cf2
* Display the language code for subtitles from Matroska files.mosu2004-08-241-0/+34
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13130 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support for subtitle switching in Matroska.mosu2004-08-241-9/+104
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13127 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixes a crash and unchecked string-handling in ENCA code.reimar2004-07-281-1/+1
| | | | | | | Also does a bit of cleanup. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12910 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not dereference NULL if no track could be found for a block.mosu2004-06-281-1/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12722 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support for the "custom colors" and "forced subtitles" entries in the VobSub ↵mosu2004-06-101-38/+132
| | | | | | idx. Made the parser handle whitespaces better. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12551 b3059339-0415-0410-9bf9-f77b7e298cf2
* Try to get the "size:" and "palette:" entries for VobSub tracks from the ↵mosu2004-06-081-0/+92
| | | | | | private data. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12548 b3059339-0415-0410-9bf9-f77b7e298cf2
* ENCA support (http://trific.ath.cx/software/enca/)henry2004-05-081-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12444 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix exploitable buffer overflowrfelker2004-04-261-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12289 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fixed the support for the A_MS/ACM CodecID which just stores a WAVEFORMATEX ↵mosu2004-04-021-8/+18
| | | | | | in the track's private data. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12102 b3059339-0415-0410-9bf9-f77b7e298cf2
* Implemented "seek to position".mosu2004-03-261-1/+45
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12074 b3059339-0415-0410-9bf9-f77b7e298cf2
* Removed the limitation to max. eight laced blocks.mosu2004-03-251-9/+21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12066 b3059339-0415-0410-9bf9-f77b7e298cf2
* Parse comma separated language lists instead of comparing the complete ↵mosu2004-03-181-5/+12
| | | | | | language string. Patch by Loren Merritt <lorenm at u dot washington dot edu> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12042 b3059339-0415-0410-9bf9-f77b7e298cf2
* Exit when an invalid EBML ID has been read (e.g. for files that have been ↵mosu2004-02-091-0/+6
| | | | | | cut off). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11935 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not open more than one audio/video/subtitle stream at the same time.mosu2004-02-011-30/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11902 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not try to seek beyond the end of the stream when parsing the headers.mosu2004-01-311-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11900 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100lrfelker2004-01-271-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11857 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not deactivate the video stream if no audio stream was wanted/found...mosu2004-01-221-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11833 b3059339-0415-0410-9bf9-f77b7e298cf2
* Compiler/system compatibility fixes.mosu2004-01-201-9/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11816 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fixed subtitle clearing.mosu2004-01-201-4/+27
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11813 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fixed the subtitle line overflowing for SSA if there were too many \N in the ↵mosu2004-01-191-2/+12
| | | | | | subs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11809 b3059339-0415-0410-9bf9-f77b7e298cf2
* Added the new C based Matroska demuxer by Aurelien Jacobs.mosu2004-01-191-0/+2850
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11808 b3059339-0415-0410-9bf9-f77b7e298cf2
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 04:31:02 +0000