Commit Graph

76 Commits

Author SHA1 Message Date
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
nicodvb a2ac4cd246 prevent possible exploit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15427 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-13 00:00:54 +00:00
nicodvb a66c45716a fixup the correct sh_a
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15425 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-12 23:27:22 +00:00
nicodvb 15ba985140 fixed too few parameters to mp_msg(); silence compilation warnings, removed unused variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15424 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-12 23:12:27 +00:00
nicodvb da2a598d9d don't call fixup_audio if there's no audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15423 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-12 23:01:52 +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 83d4f16ae5 Fix the memleak fix: in case of error, demux_close_ogg should be called
only once and demuxer->priv be freed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15322 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-02 07:59:12 +00:00
mosu 9e5531f861 Nasty workaround for codec initialization data. In _at least_ one case (AAC) the stream_header.size element seems to be four bytes off. Skip those bytes but only for known cases (again AAC) and not for all.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15314 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-01 10:40:42 +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
henry 3d602b653c Theora fixes:
- do not use negative stride (fixes -vf pp crash)
- pass true image dimensions to VO, not the aligned ones (fixes incorrect
aspect ratio bug & black bar under video)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14764 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-22 19:18:45 +00:00
reimar 02f5ebf1d5 Memleak fixes. Based on patch by Timothy Lee (timothy lee at siriushk com).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14667 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-06 10:30:10 +00:00
mosu 3de4b2a2d5 More user-friendly stream, -xid and -slang info output even in non-verbose mode part 2.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14575 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-22 14:28:23 +00:00
mosu 1d60bf5454 More user-friendly stream, -xid and -slang info output even in non-verbose mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14563 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-21 18:55:01 +00:00
reimar e7568f0179 100l, completely broken pointer arithmetic causing crashes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14536 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-19 12:12:36 +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 9ea3354fbf Fix member alignment for usage on 64bit processors.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13882 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-05 21:40:34 +00:00
mosu 6bc7b34350 Declare a prototype for the function before it is used. Otherwise some compiler versions will "optimize" them away, and linking will fail.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13804 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-30 08:42:25 +00:00
reimar 82f168a4f6 some memory leaks fixed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13642 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-14 15:09:35 +00:00
joey c9040923b7 show ogg subtitle language on OSD, if available
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13503 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-28 14:00:49 +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 bddf8c6c27 Do not use globals. Put the variables into the appropriate demuxer struct instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13128 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-24 21:20:24 +00:00
joey 1b8e3babb8 moved combined vobsub_lang into sub_select
add support for dvd subs and ogg subs into sub_select
document sub_select
vobsub_lang left as a link to sub_select for backwards compatibility


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13090 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-22 18:47:48 +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 e9ff38d39b The granulepos does not depend on the number of channels, only on the sample size. Patch by Wolfram Gloger (wmglo at dent dot med dot uni-muenchen dot de).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12704 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-27 13:55:40 +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
mosu 7ca187a068 Cosmetics. Shortened the "displaying subtitle..." message. Replaced "OGG" with "Ogg" as it is a name, not an abbreviation/acronym.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12435 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-07 08:31:39 +00:00
mosu 885ed6c52f Be more verbose and tell the user which subtitle stream has been selected (if any).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12431 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-05 21:05:36 +00:00
mosu 9318af9842 Leave the subs uninitialized and not "forcefully off" if the user hasn't chosen a stream with -sid. If he used -slang then we need the comment packet which might be found after demux_ogg_open has finished.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12352 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-29 21:01:09 +00:00
rfelker ebfa939727 1000000000000l to bunkus
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12266 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-23 22:30:18 +00:00
mosu 3d2d5a763f Clear subs in broken OGM files (those without empty subtitle packets) a bit later in order to avoid flickering if there are more subs following immediately. Patch by Michael Reinsch <mr at uue adot org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12265 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-23 16:36:33 +00:00
mosu a965ebf6b2 Much improved seeking. Patch by Michael Behrich <behrisch at informatik adot hu-berlin anotherdot de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12264 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-23 16:31:30 +00:00
mosu 6a34e840e9 Changed -sid/-aid/-vid to be zero based and select the n'th stream of its type, e.g. -sid 1 will select the second subtitle stream.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12136 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-06 06:36:46 +00:00
mosu cecfdb8276 Support for selecting subtitles with -slang. Patch by Andriy N Gritsenko <andrej at lucky onedot net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12105 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-02 19:20:34 +00:00
mosu c4105bb731 Cleanup and small improvement in seeking if the final_granulepos is known. Patch by Michael Behrisch <behrisch@informatik.hu-berlin.de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11899 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-31 09:38:01 +00:00
mosu 2a4313fffd Properly set the file duration for audio-only Ogg files. Patch by Michael Behrisch <behrisch@informatik.hu-berlin.de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11757 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-06 11:22:32 +00:00
alex ae1e09cbc8 1000l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11578 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-08 11:11:32 +00:00
mosu 36aee71950 Fixes for a couple of warnings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11577 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-08 09:51:10 +00:00
mosu a1f615e34d Get the total length for Ogg files. Patch by Michael Behrisch <behrisch@informatik.hu-berlin.de>.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11576 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-08 09:47:15 +00:00
mosu 76264802b3 Small format fixes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11468 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-11-15 22:46:47 +00:00
mosu 8856a7594c For FLAC-in-Ogg the packets are NEVER skipped, and there's no such thing as a "packet header byte" like in Ogm streams. Basically the handling for Vorbis != Theora != FLAC != Ogm.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11465 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-11-15 20:00:31 +00:00
mosu 0c2f4a3989 Clear subs a bit later than requested in order to avoid clearing the subs if the following entry starts exactly after this one. Patch by Jarrod Johnson <jbj-mplayer@ura.dnsalias.org>.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11129 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-15 16:46:55 +00:00
lumag 1e880aa659 FLAC decoding support via imported libmpflac.
TODO: fix FLAC-in-ogg decoding.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11005 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-04 22:00:25 +00:00
gabucino fadce2d781 many small typo and grammar fixes
Based on Bernard Leak's mail <bernard 4t brenda-arkle.demon.co.uk>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11001 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-04 17:29:08 +00:00
mosu 676d664756 Do not automatically select a subtitle stream for display.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10801 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-09-02 16:35:39 +00:00
mosu a4510b38e2 Fix for Theora files without audio. Patch by David Kuehling <dvdkhlng@gmx.de>.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10712 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-28 17:32:28 +00:00
alex b2b796f466 Theora-CVS update patch by Martin Drab <drab@kepler.fjfi.cvut.cz>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10659 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-18 13:13:41 +00:00
diego a9bcc8342c Spelling police:
Something that we do not know about is unknowN.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10609 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-14 12:15:44 +00:00
diego 8838b4afa6 output typo fixes: unknow --> unknown
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10398 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-07-09 01:30:24 +00:00
albeu 3d723aa626 A little hack to be able to play ogg radio stream
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10364 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-07-02 20:43:07 +00:00
mosu 7787041e0b Preliminary Theora support. Patch by David Kuehling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10093 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-05-11 16:39:16 +00:00