summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mkv.c
Commit message (Collapse)AuthorAgeFilesLines
* Fix warnings:diego2007-08-261-2/+0
| | | | | | | | | | demux_mkv.c: In function 'demux_mkv_read_chapters': demux_mkv.c:1299: warning: unused variable 'mkv_d' demux_mkv.c: In function 'handle_subtitles': demux_mkv.c:2740: warning: unused variable 'mkv_d' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24219 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid crash if a non-existent audio track is selected with -aidreimar2007-07-161-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23790 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix typo in a commentaurel2007-07-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23771 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add some missing frees.reimar2007-07-051-2/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23724 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid code duplication and ugly config.h hack by using av_strlcat/av_strlcpyreimar2007-07-051-2/+3
| | | | | | | instead of plain strlcat/strlcpy git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23723 b3059339-0415-0410-9bf9-f77b7e298cf2
* index_mode is already defined in demuxer.hreimar2007-06-241-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23650 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove the now unused demux_mkv_change_subs functionreimar2007-06-241-39/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23620 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set demuxer->sub->sh to one of the s_streams like done for audio and video.reimar2007-06-241-24/+17
| | | | | | | | This makes the code simpler and more like the other demuxers, allowing to remove some special cases in mplayer.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23618 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l, last demux_mkv patch passed ints instead of pointers to them to sscanfreimar2007-06-231-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23611 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use sh_sub_t instead of mkv_track_t argument where possible, simplifying the ↵reimar2007-06-231-30/+30
| | | | | | code a bit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23610 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_mkv very long seek fixuau2007-06-201-1/+1
| | | | | | | | | | | | | | | | | | The seek code searching for the closest position in the index used "int64_t min_diff=0xFFFFFFFL" as the initial "further from the goal than any real alternative" value. The unit is milliseconds so seeks more than about 75 hours past the end of the file would fail to recognize the last index position as the best match. This was triggered in practice by chapter seek code which apparently uses a seek of 1000000000 seconds forward to mean "seek to the end". The practical effect was that trying to seek to the next chapter in a file without chapters made MPlayer block until it finished reading the file from the current position to the end. Fixed by increasing the initial value from FFFFFFF to FFFFFFFFFFFFFFF. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23592 b3059339-0415-0410-9bf9-f77b7e298cf2
* Don't set random codec parameters for AC3/DTS in mkv.aurel2007-06-101-2/+2
| | | | | | | | | Those values are not needed anyway. This fixes stream copying from mkv with mencoder. Patch by Trent Piepho. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23534 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix segfault when encoding from an mkv file with embedded fonts.eugeni2007-06-071-1/+2
| | | | | | | Patch by Dominique Dumont (domi dumont at free fr). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23502 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of __attribute__((__packed__)) in Matroska demuxerreimar2007-05-281-122/+43
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23404 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove useless setting of dp->len, it is already set to that value byreimar2007-05-171-1/+0
| | | | | | | new_demux_packet git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23328 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix indentation broken in r23287reimar2007-05-101-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23290 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
* Avoid code duplication in mkv demuxer for standard fourcc/extradata handlingreimar2007-05-101-29/+23
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23288 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix NULL pointer dereference in demux_mkv that happens wheneugeni2007-05-011-2/+2
| | | | | | | | demux_mkv_get_sub_lang (or demux_mkv_get_audio_lang) is called with an invalid track number. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23205 b3059339-0415-0410-9bf9-f77b7e298cf2
* Matroska seeking fixesuau2007-03-161-12/+22
| | | | | | | | | | | | | | | | | If a relative seek forward went past the last index position the Matroska demuxer did not seek to any index position. It did however set the mkv_d->skip_to_timecode variable which meant that the next fill_buffer() call would read from the current position until the target position (probably the end of the file). Fix this by changing the code to seek to the last index position if that is between the current and target positions. Also change backwards relative seek to accept an exactly matching index position (<= vs <) and reorganize the seeking conditionals to allow making the above change without turning the code into a complete mess. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22634 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use explicit path for headers from the loader/ directory.diego2007-03-151-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22624 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add explicit location for headers from the stream/ directory.diego2007-03-151-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22623 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove subcp_open/subcp_close from mkv demuxer, they are useless since a ↵reimar2007-03-051-7/+0
| | | | | | long time. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22463 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use libavutil's av_clip* instead of unreadable MIN/MAX chaos.reimar2007-03-011-13/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22395 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make sure sub->sh is set when a subtitle is selectedreimar2007-02-081-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22175 b3059339-0415-0410-9bf9-f77b7e298cf2
* Another round of subtitle code cleanupreimar2007-02-051-54/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22155 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make mkv demuxer use ffmpeg LZO as well.reimar2007-01-311-17/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22099 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify and make lzo decompression code more similar to zlib one.reimar2007-01-271-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22029 b3059339-0415-0410-9bf9-f77b7e298cf2
* Forgotten free on errorreimar2007-01-271-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22028 b3059339-0415-0410-9bf9-f77b7e298cf2
* *dest = malloc (*size); is useless directly before *dest = realloc (*dest, ↵reimar2007-01-271-1/+1
| | | | | | *size); git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22026 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove comment printed by -demuxer help, it belongs in the copyright header.diego2007-01-251-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22015 b3059339-0415-0410-9bf9-f77b7e298cf2
* Subtitle handling cleanup: factor out code for parsing embedded subtitlesreimar2007-01-061-152/+13
| | | | | | | and adding and removing of lines in subtitle struct into subreader.c. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21845 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix display of multiple simultaneous subtitles without libass.uau2006-12-211-1/+3
| | | | | | | Was broken in r19649. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21720 b3059339-0415-0410-9bf9-f77b7e298cf2
* VobSub tracks cannot be handled by libass, do not mark them with 'a'.eugeni2006-12-151-1/+2
| | | | | | | This fixes the bug with VobSub not being displayed with -ass. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21625 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename: ass_process_font -> ass_add_font.eugeni2006-12-031-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21471 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove superfluous bswap.h include.diego2006-12-021-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21437 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: indentation fix.eugeni2006-11-231-10/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21182 b3059339-0415-0410-9bf9-f77b7e298cf2
* Generalize subtitle switching, demux_ogg does not need a special casereimar2006-11-191-20/+0
| | | | | | | anymore and demux_mov works now, too. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21054 b3059339-0415-0410-9bf9-f77b7e298cf2
* Don't spam the console with timestamps (non-error messages printed every rtogni2006-11-141-2/+2
| | | | | | | frame should be lower than V level) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20937 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix extradata passing to lavc RV20 decoderrtogni2006-11-141-13/+7
| | | | | | | | | | | | Pass video codec extradata unchanged from demux_real, sync vd_realvid to the new format Sync mkv demuxer to the changes above (cmsg24 extradata was totally broken before) Detect cmsg24 size from extradata (was fixed) Based on a patch by elupus >> elupus >a< ecce se << git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20936 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make subtitle stream handling more similar to audio and video streams.reimar2006-11-131-6/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20888 b3059339-0415-0410-9bf9-f77b7e298cf2
* If parsing a seek head fails then mplayer should try continue parsing the ↵mosu2006-11-071-0/+9
| | | | | | file after the seek head. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20750 b3059339-0415-0410-9bf9-f77b7e298cf2
* 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-