Commit Graph

61 Commits

Author SHA1 Message Date
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
arpi a5fe487b50 100l... ogg-in-avi (type 0xFFFE) fix
sizeof(WAVEFORMATEX) is 18, since i've fixed struct align, so
2*sizeof(WAVEFORMATEX) is !=40 any more.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9164 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-29 21:53:56 +00:00
mosu 6c4f39360a mosu: Fixed OGG/OGM seeking for XCDs in which the OGG/OGM does not start at pos 0 in the stream
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8796 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-05 13:48:13 +00:00
mosu bc8b12fe7b mosu: subtitles will be cleared after their life time as given in the packet's header has expired and after seeking
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8789 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-04 22:56:56 +00:00
mosu 673897aa36 bunkus: Fixed Ogg/Ogm seeking by discarding the first packet after the seek which may be incomplete
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8656 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-30 08:59:33 +00:00
arpi e29bcd7e02 This patch adds a call to subcp_recode1(), so this subtitles too are
processed through iconv().
Kresimir Kukulj                      madmax@iskon.hr


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8619 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 15:19:41 +00:00
rguyom feb55b839d Really (!) sync ov_struct_st between demux_ogg.c and ad_libvorbis.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8376 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-05 21:04:26 +00:00
rguyom a0b67c1746 Sync ov_struct_st between demux_ogg.c and ad_libvorbis.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8375 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-05 21:01:59 +00:00
rguyom 984c1c4602 Add Tremor (an integer-only Vorbis decoder) support.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8343 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-04 20:27:36 +00:00
arpi f859d013a8 *HUGE* set of compiler warning fixes, unused variables removal
based on patch by Dominik Mierzejewski <dominik@rangers.eu.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8124 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-06 23:54:29 +00:00
arpi 39fe4d0cd3 verbose can be negative
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8028 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-01 17:46:45 +00:00
arpi c88b1c67fb endianess independency (using get int 16/32/64 func instead of typecasting pointer)
patch by Hampa Hug <hhug@student.ethz.ch>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7846 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-22 15:41:41 +00:00
arpi bf755a5a41 memleak fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7761 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-16 20:17:20 +00:00
arpi 0013558c06 removed dummy OGG functions - use #ifdef instead
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7414 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-15 22:38:30 +00:00
arpi 424831f651 The granule position of pages contining Vorbis audio is in units of
PCM audio samples (per channel; a stereo stream's granule position does
no increment at twice the speed of a mono stream).
patch by Moritz Bunkus <moritz@bunkus.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7397 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-14 23:21:22 +00:00
alex ac943f379a fixes problems when new line is just '\n' and not '\r\n' and enabled html-markup ignore. Patch by Piotr Krukowiecki <piotr@pingu.ii.uj.edu.pl>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7116 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-28 17:07:55 +00:00