1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-28 01:52:19 +00:00
Commit Graph

54 Commits

Author SHA1 Message Date
mosu
2e40bfa136 Improved handling of text subs in Matroska files with adjacent newlines (\N) 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
2006-01-04 12:05:15 +00:00
diego
36e1974be0 Unify include path handling, -I.. is in CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17013 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-18 14:39:25 +00:00
lorenm
316bb1d44c sort timestamps instead of assuming conventional B-frame order. (fixes x264 B-pyramid)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16913 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-05 04:56:23 +00:00
reimar
2912984517 move resync_audio_stream after seeking to demuxer.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16878 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-30 09:19:05 +00:00
mosu
d7a113f20d Added support for A_AAC.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16825 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-22 10:13:28 +00:00
reimar
169416fd51 Use PRI?64 defines as format strings for 64 bit variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16751 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-13 18:33:56 +00:00
ods15
d620029e4b Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
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
2005-09-02 08:32:32 +00:00
mosu
a030e2fe1c Fixed seeking for AVC-in-Matroska (wrong assumption of what kind of references may be present for a non-I-frame).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16303 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-24 12:33:32 +00:00
rtognimp
cd68e1618b Demuxer modularization
Demuxer selection by name with -demuxer command (bakward compatible)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16176 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-05 19:57:47 +00:00
mosu
11bfc67802 demux_stream_t.pts should not be assigned by the demuxer. Fixes playback of 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
2005-06-09 07:45:17 +00:00
mosu
d8500a1a3b Do not switch to audio tracks whose codec private data differs from the main 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
2005-05-21 06:50:08 +00:00
mosu
87f93d9d7f Reset the saved max_pts used for timecode reordering after seeking. 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
2005-05-19 12:09:26 +00:00
nicodvb
f595bf38ce removed unused variables
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15451 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-14 06:52:25 +00:00
nicodvb
3d450d0389 vorbis extradata is now passed from demuxer to decoder in matroska's way
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15421 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-12 17:35:58 +00:00
reimar
be54f4813f adds a parameter to the switch_audio command to directly select a track.
Patch by kiriuja mplayer-patches at en-directo net


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15286 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-28 14:43:19 +00:00
gpoirier
2a08792ee8 Online audio switching now supports Matroska too. Patch by Michael Behrisch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15155 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-13 22:33:19 +00:00
rfelker
4eb1b755bb Fix the ogg fourcc nightmare!!!
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
2005-02-27 18:11:17 +00:00
mosu
efd53eed61 Handle missing palettes in the info part of VobSubs in Matroska files 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
2005-01-21 18:25:44 +00:00
mosu
1cea37532f More support for AVC in Matroska.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14516 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-16 14:59:19 +00:00
reimar
027ed1e38e set sub_utf8 only when actually using mkv subtitles, will break external
subtitles (-sub) otherwise.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14514 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-16 12:17:41 +00:00
reimar
d147077c21 Move generic length and percent pos calculation to demuxer.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14503 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-15 16:11:45 +00:00
mosu
60e7dabb30 Do not access word-sized elements on potentially unaligned memory addresses. RISC processors usually do not like that.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14490 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-13 21:04:34 +00:00
reimar
11880705aa Call subcp_close when closing the demuxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14462 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-11 18:32:49 +00:00
mosu
06bca786bd Support for AVC in Matroska.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14459 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-11 08:30:56 +00:00
mosu
911e30b26f Make use of the default duration for one frame if it is present in the file. 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
2004-11-28 21:08:46 +00:00
mosu
2f83863883 Added support for MPEG-1 and MPEG-2 in Matroska.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14055 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-26 16:36:03 +00:00
mosu
50a86fcc34 Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14047 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-25 22:24:00 +00:00
mosu
6042541374 DTS uses the format tag 0x2001. Patch by Joakim Plate (joakim ! plate () ecce ! se)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13805 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-30 08:47:04 +00:00
joey
baef32bc2c fix sub_select fiasco with global sub numbering. now multiple sub sources can be managed in essentially one list.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13502 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-28 13:51:20 +00:00
mosu
07685ad398 With the latest change to dec_audio.c (1.32) the demuxers have to set sh_a->samplesize to something != 0.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13425 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-21 18:02:33 +00:00
reimar
a894ca74e8 fix playback of files with displaysize not set (aspect was set to NaN for these)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13382 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-18 14:35:19 +00:00
mosu
d7f693a204 Spelling. Patch by Jan Minar <jjminar at fastmail onedot fm>.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13325 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-12 14:01:13 +00:00
mosu
1642ed2fc3 Cosmetics: fix some compiler warnings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13132 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-25 07:52:52 +00:00
mosu
51fe7e4a6a Display the language code for subtitles from Matroska files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13130 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-24 21:37:41 +00:00
mosu
55e4ded2bc Support for subtitle switching in Matroska.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13127 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-24 20:58:29 +00:00
reimar
57b8d5c7f6 fixes a crash and unchecked string-handling in ENCA code.
Also does a bit of cleanup.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12910 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-28 12:40:35 +00:00
mosu
32c0500f97 Do not dereference NULL if no track could be found for a block.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12722 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-28 16:43:01 +00:00
mosu
adcae3e051 Support for the "custom colors" and "forced subtitles" entries in the VobSub idx. Made the parser handle whitespaces better.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12551 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-10 11:16:44 +00:00
mosu
8e68ace3ab Try to get the "size:" and "palette:" entries for VobSub tracks from the private data.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12548 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-08 21:30:32 +00:00
henry
c1f6ffe35d ENCA support (http://trific.ath.cx/software/enca/)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12444 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-08 17:52:25 +00:00
rfelker
d574a77cf3 fix exploitable buffer overflow
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12289 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-26 09:22:17 +00:00
mosu
0cbb4f5c2d Fixed the support for the A_MS/ACM CodecID which just stores a WAVEFORMATEX in the track's private data.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12102 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-02 07:36:42 +00:00
mosu
64667ec554 Implemented "seek to position".
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12074 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-03-26 19:45:06 +00:00
mosu
52fdaaef8c Removed the limitation to max. eight laced blocks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12066 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-03-25 20:47:37 +00:00
mosu
e8a1b37130 Parse comma separated language lists instead of comparing the complete 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
2004-03-18 08:37:21 +00:00
mosu
9093ce10da Exit when an invalid EBML ID has been read (e.g. for files that have been cut off).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11935 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-02-09 19:21:08 +00:00
mosu
b5b7425795 Do not open more than one audio/video/subtitle stream at the same time.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11902 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-02-01 10:58:50 +00:00
mosu
3241e6a208 Do not try to seek beyond the end of the stream when parsing the headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11900 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-31 09:54:09 +00:00
rfelker
a38d15e8af 100l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11857 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-27 06:02:29 +00:00
mosu
d845592653 Do not deactivate the video stream if no audio stream was wanted/found...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11833 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-22 21:43:36 +00:00