summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_ogg.c
Commit message (Collapse)AuthorAgeFilesLines
* prevent possible exploitnicodvb2005-05-131-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15427 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixup the correct sh_anicodvb2005-05-121-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15425 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixed too few parameters to mp_msg(); silence compilation warnings, removed ↵nicodvb2005-05-121-5/+5
| | | | | | unused variable git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15424 b3059339-0415-0410-9bf9-f77b7e298cf2
* don't call fixup_audio if there's no audionicodvb2005-05-121-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15423 b3059339-0415-0410-9bf9-f77b7e298cf2
* vorbis extradata is now passed from demuxer to decoder in matroska's waynicodvb2005-05-121-0/+83
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15421 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix the memleak fix: in case of error, demux_close_ogg should be calledreimar2005-05-021-4/+1
| | | | | | | only once and demuxer->priv be freed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15322 b3059339-0415-0410-9bf9-f77b7e298cf2
* Nasty workaround for codec initialization data. In _at least_ one case (AAC) ↵mosu2005-05-011-1/+14
| | | | | | 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
* Fix the ogg fourcc nightmare!!!rfelker2005-02-271-12/+15
| | | | | | | | | | | | | | | | | 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
* Theora fixes:henry2005-02-221-2/+2
| | | | | | | | | - 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
* Memleak fixes. Based on patch by Timothy Lee (timothy lee at siriushk com).reimar2005-02-061-6/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14667 b3059339-0415-0410-9bf9-f77b7e298cf2
* More user-friendly stream, -xid and -slang info output even in non-verbose ↵mosu2005-01-221-8/+6
| | | | | | mode part 2. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14575 b3059339-0415-0410-9bf9-f77b7e298cf2
* More user-friendly stream, -xid and -slang info output even in non-verbose mode.mosu2005-01-211-5/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14563 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l, completely broken pointer arithmetic causing crashes.reimar2005-01-191-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14536 b3059339-0415-0410-9bf9-f77b7e298cf2
* Output more information about vids, aids, sids, alangs and slangs with ↵mosu2004-11-251-0/+35
| | | | | | -identify. Patch by kiriuja <mplayer-patches@en-directo.net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14047 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix member alignment for usage on 64bit processors.mosu2004-11-051-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13882 b3059339-0415-0410-9bf9-f77b7e298cf2
* Declare a prototype for the function before it is used. Otherwise some ↵mosu2004-10-301-0/+2
| | | | | | 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
* some memory leaks fixedreimar2004-10-141-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13642 b3059339-0415-0410-9bf9-f77b7e298cf2
* show ogg subtitle language on OSD, if availablejoey2004-09-281-0/+39
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13503 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix sub_select fiasco with global sub numbering. now multiple sub sources ↵joey2004-09-281-0/+2
| | | | | | can be managed in essentially one list. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13502 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not use globals. Put the variables into the appropriate demuxer struct ↵mosu2004-08-241-10/+34
| | | | | | instead. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13128 b3059339-0415-0410-9bf9-f77b7e298cf2
* moved combined vobsub_lang into sub_selectjoey2004-08-221-1/+9
| | | | | | | | | 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
* fixes a crash and unchecked string-handling in ENCA code.reimar2004-07-281-1/+1
| | | | | | | Also does a bit of cleanup. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12910 b3059339-0415-0410-9bf9-f77b7e298cf2
* The granulepos does not depend on the number of channels, only on the sample ↵mosu2004-06-271-8/+15
| | | | | | 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
* ENCA support (http://trific.ath.cx/software/enca/)henry2004-05-081-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12444 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics. Shortened the "displaying subtitle..." message. Replaced "OGG" ↵mosu2004-05-071-28/+28
| | | | | | 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
* Be more verbose and tell the user which subtitle stream has been selected ↵mosu2004-05-051-2/+4
| | | | | | (if any). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12431 b3059339-0415-0410-9bf9-f77b7e298cf2
* Leave the subs uninitialized and not "forcefully off" if the user hasn't ↵mosu2004-04-291-2/+5
| | | | | | 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
* 1000000000000l to bunkusrfelker2004-04-231-4/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12266 b3059339-0415-0410-9bf9-f77b7e298cf2
* Clear subs in broken OGM files (those without empty subtitle packets) a bit ↵mosu2004-04-231-1/+1
| | | | | | 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
* Much improved seeking. Patch by Michael Behrich <behrisch at informatik adot ↵mosu2004-04-231-45/+98
| | | | | | hu-berlin anotherdot de> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12264 b3059339-0415-0410-9bf9-f77b7e298cf2
* Changed -sid/-aid/-vid to be zero based and select the n'th stream of its ↵mosu2004-04-061-7/+18
| | | | | | 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
* Support for selecting subtitles with -slang. Patch by Andriy N Gritsenko ↵mosu2004-04-021-7/+86
| | | | | | <andrej at lucky onedot net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12105 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cleanup and small improvement in seeking if the final_granulepos is known. ↵mosu2004-01-311-11/+9
| | | | | | Patch by Michael Behrisch <behrisch@informatik.hu-berlin.de> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11899 b3059339-0415-0410-9bf9-f77b7e298cf2
* Properly set the file duration for audio-only Ogg files. Patch by Michael ↵mosu2004-01-061-0/+2
| | | | | | Behrisch <behrisch@informatik.hu-berlin.de> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11757 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1000lalex2003-12-081-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11578 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fixes for a couple of warnings.mosu2003-12-081-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11577 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get the total length for Ogg files. Patch by Michael Behrisch ↵mosu2003-12-081-8/+48
| | | | | | <behrisch@informatik.hu-berlin.de>. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11576 b3059339-0415-0410-9bf9-f77b7e298cf2
* Small format fixes.mosu2003-11-151-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11468 b3059339-0415-0410-9bf9-f77b7e298cf2
* For FLAC-in-Ogg the packets are NEVER skipped, and there's no such thing as ↵mosu2003-11-151-2/+4
| | | | | | 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
* Clear subs a bit later than requested in order to avoid clearing the subs if ↵mosu2003-10-151-1/+1
| | | | | | 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
* FLAC decoding support via imported libmpflac.lumag2003-10-041-0/+16
| | | | | | | TODO: fix FLAC-in-ogg decoding. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11005 b3059339-0415-0410-9bf9-f77b7e298cf2
* many small typo and grammar fixesgabucino2003-10-041-1/+1
| | | | | | | 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
* Do not automatically select a subtitle stream for display.mosu2003-09-021-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10801 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix for Theora files without audio. Patch by David Kuehling <dvdkhlng@gmx.de>.mosu2003-08-281-1/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10712 b3059339-0415-0410-9bf9-f77b7e298cf2
* Theora-CVS update patch by Martin Drab <drab@kepler.fjfi.cvut.cz>alex2003-08-181-1/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10659 b3059339-0415-0410-9bf9-f77b7e298cf2
* Spelling police:diego2003-08-141-1/+1
| | | | | | | Something that we do not know about is unknowN. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10609 b3059339-0415-0410-9bf9-f77b7e298cf2
* output typo fixes: unknow --> unknowndiego2003-07-091-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10398 b3059339-0415-0410-9bf9-f77b7e298cf2
* A little hack to be able to play ogg radio streamalbeu2003-07-021-2/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10364 b3059339-0415-0410-9bf9-f77b7e298cf2
* Preliminary Theora support. Patch by David Kuehling.mosu2003-05-111-25/+128
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10093 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l... ogg-in-avi (type 0xFFFE) fixarpi2003-01-291-6/+7
| | | | | | | | 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
* mosu: Fixed OGG/OGM seeking for XCDs in which the OGG/OGM does not start at ↵mosu2003-01-051-7/+6
| | | | | | pos 0 in the stream git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8796 b3059339-0415-0410-9bf9-f77b7e298cf2
* mosu: subtitles will be cleared after their life time as given in the ↵mosu2003-01-041-4/+33
| | | | | | packet's header has expired and after seeking git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8789 b3059339-0415-0410-9bf9-f77b7e298cf2
* bunkus: Fixed Ogg/Ogm seeking by discarding the first packet after the seek ↵mosu2002-12-301-2/+9
| | | | | | which may be incomplete git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8656 b3059339-0415-0410-9bf9-f77b7e298cf2
* This patch adds a call to subcp_recode1(), so this subtitles too arearpi2002-12-281-0/+11
| | | | | | | | processed through iconv(). Kresimir Kukulj madmax@iskon.hr git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8619 b3059339-0415-0410-9bf9-f77b7e298cf2
* Really (!) sync ov_struct_st between demux_ogg.c and ad_libvorbis.crguyom2002-12-051-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8376 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync ov_struct_st between demux_ogg.c and ad_libvorbis.crguyom2002-12-051-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8375 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add Tremor (an integer-only Vorbis decoder) support.rguyom2002-12-041-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8343 b3059339-0415-0410-9bf9-f77b7e298cf2
* *HUGE* set of compiler warning fixes, unused variables removalarpi2002-11-061-0/+5
| | | | | | | 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
* verbose can be negativearpi2002-11-011-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8028 b3059339-0415-0410-9bf9-f77b7e298cf2
* endianess independency (using get int 16/32/64 func instead of typecasting ↵arpi2002-10-221-24/+75
| | | | | | | | | pointer) patch by Hampa Hug <hhug@student.ethz.ch> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7846 b3059339-0415-0410-9bf9-f77b7e298cf2
* memleak fixarpi2002-10-161-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7761 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed dummy OGG functions - use #ifdef insteadarpi2002-09-151-22/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7414 b3059339-0415-0410-9bf9-f77b7e298cf2
* The granule position of pages contining Vorbis audio is in units ofarpi2002-09-141-2/+2
| | | | | | | | | 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
* fixes problems when new line is just '\n' and not '\r\n' and enabled ↵alex2002-08-281-2/+2
| | | | | | 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
* ogg (.ogm) text subtitles supportarpi2002-08-141-4/+81
| | | | | | | based on patch by Chris Forno <jcore@m-net.arbornet.org> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7011 b3059339-0415-0410-9bf9-f77b7e298cf2
* ogm audio format id is in hex, not decarpi2002-07-301-1/+1
| | | | | | | patch by Moritz Bunkus <moritz@bunkus.org> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6851 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10L bugfixalbeu2002-05-231-2/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6157 b3059339-0415-0410-9bf9-f77b7e298cf2
* a/v stream selection - patch by alexander.werth@gmx.dearpi2002-05-191-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6125 b3059339-0415-0410-9bf9-f77b7e298cf2
* Uninit addedalbeu2002-04-241-0/+18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5813 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add seeking without index (still not perfect). Use -forceidx for thealbeu2002-04-241-50/+83
| | | | | | | version with index. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5810 b3059339-0415-0410-9bf9-f77b7e298cf2
* Seeking implementedalbeu2002-04-201-42/+269
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5733 b3059339-0415-0410-9bf9-f77b7e298cf2
* argh, some samples sue new header chunks - fixedarpi2002-03-311-1/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5431 b3059339-0415-0410-9bf9-f77b7e298cf2
* BITMAPINFOHEADER fixed to be accepted by win32 decoders (divx,divxds)arpi2002-03-311-4/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5430 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixed 10l bug: using ds instead of dp, and adding