aboutsummaryrefslogtreecommitdiffhomepage
path: root/libmpdemux/demux_mkv.c
Commit message (Collapse)AuthorAge
* Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().Gravatar eugeni2008-01-12
| | | | | | | These attachments are passed to libass after demuxer is opened. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25686 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move all subtitle parsing from mkv demuxer to update_subtitles().Gravatar eugeni2008-01-11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25683 b3059339-0415-0410-9bf9-f77b7e298cf2
* Init and destroy ass_tracks in demuxer.c based on sh_sub->type value.Gravatar eugeni2008-01-11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25682 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set extradata for subtitle tracks in mkv demuxer.Gravatar eugeni2008-01-11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25681 b3059339-0415-0410-9bf9-f77b7e298cf2
* Factorize private data decoding for subtitle tracks in mkv demuxer.Gravatar eugeni2008-01-11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25679 b3059339-0415-0410-9bf9-f77b7e298cf2
* Vobsub support tridx setting in .idx file.Gravatar ulion2007-12-19
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25460 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move temp variable declaration into inner loop scope.Gravatar ulion2007-12-10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25332 b3059339-0415-0410-9bf9-f77b7e298cf2
* Convert vobsub custom colors from rgb to yuv using a common function.Gravatar ulion2007-12-09
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25326 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move vobsub palette->yuv convert code into a common function.Gravatar ulion2007-12-08
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25320 b3059339-0415-0410-9bf9-f77b7e298cf2
* Restore y of palette into the same value range as it was in the .ifo file.Gravatar ulion2007-12-08
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25317 b3059339-0415-0410-9bf9-f77b7e298cf2
* add support for wavpack into matroskaGravatar aurel2007-10-21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24833 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix warnings:Gravatar diego2007-08-26
| | | | | | | | | | 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 -aidGravatar reimar2007-07-16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23790 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix typo in a commentGravatar aurel2007-07-13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23771 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add some missing frees.Gravatar reimar2007-07-05
| | | | 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_strlcpyGravatar reimar2007-07-05
| | | | | | | 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.hGravatar reimar2007-06-24
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23650 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove the now unused demux_mkv_change_subs functionGravatar reimar2007-06-24
| | | | 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.Gravatar reimar2007-06-24
| | | | | | | | 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 sscanfGravatar reimar2007-06-23
| | | | 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 ↵Gravatar reimar2007-06-23
| | | | | | code a bit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23610 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_mkv very long seek fixGravatar uau2007-06-20
| | | | | | | | | | | | | | | | | | 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.Gravatar aurel2007-06-10
| | | | | | | | | 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.Gravatar eugeni2007-06-07
| | | | | | | 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 demuxerGravatar reimar2007-05-28
| | | | 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 byGravatar reimar2007-05-17
| | | | | | | new_demux_packet git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23328 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix indentation broken in r23287Gravatar reimar2007-05-10
| | | | 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.mkvGravatar reimar2007-05-10
| | | | 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 handlingGravatar reimar2007-05-10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23288 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix NULL pointer dereference in demux_mkv that happens whenGravatar eugeni2007-05-01
| | | | | | | | 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 fixesGravatar uau2007-03-16
| | | | | | | | | | | | | | | | | 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.Gravatar diego2007-03-15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22624 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add explicit location for headers from the stream/ directory.Gravatar diego2007-03-15
| | | | 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 ↵Gravatar reimar2007-03-05
| | | | | | 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.Gravatar reimar2007-03-01
| | | | 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 selectedGravatar reimar2007-02-08
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22175 b3059339-0415-0410-9bf9-f77b7e298cf2
* Another round of subtitle code cleanupGravatar reimar2007-02-05
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22155 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make mkv demuxer use ffmpeg LZO as well.Gravatar reimar2007-01-31
| | | | 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.Gravatar reimar2007-01-27
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22029 b3059339-0415-0410-9bf9-f77b7e298cf2
* Forgotten free on errorGravatar reimar2007-01-27
| | | | 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, ↵Gravatar reimar2007-01-27
| | | | | | *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.Gravatar diego2007-01-25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22015 b3059339-0415-0410-9bf9-f77b7e298cf2
* Subtitle handling cleanup: factor out code for parsing embedded subtitlesGravatar reimar2007-01-06
| | | | | | | 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.Gravatar uau2006-12-21
| | | | | | | 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'.Gravatar eugeni2006-12-15
| | | | | | | 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.Gravatar eugeni2006-12-03
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21471 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove superfluous bswap.h include.Gravatar diego2006-12-02
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21437 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: indentation fix.Gravatar eugeni2006-11-23
| | | | 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 caseGravatar reimar2006-11-19
| | | | | | | 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 Gravatar rtogni2006-11-14
| | | | | | | frame should be lower than V level) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20937 b3059339-0415-0410-9bf9-f77b7e298cf2
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-26 01:33:54 +0000