aboutsummaryrefslogtreecommitdiffhomepage
path: root/libmpdemux/demux_ogg.c
Commit message (Collapse)AuthorAge
* accidentally committed this overflow fix with the declaration fix before.Gravatar rfelker2006-05-13
| | | | | | | | messed up indention corrected at oded's request. :) 10^100l to me too.. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18469 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10^100l c++ declarationsGravatar rfelker2006-05-13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18466 b3059339-0415-0410-9bf9-f77b7e298cf2
* unbind demux_ogg from ad_libvorbis; this permits to use -ac ffvorbis without ↵Gravatar nicodvb2006-05-10
| | | | | | crashes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18431 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get ride of the several if(identify) messy lines and rearangment of some of ↵Gravatar reynaldo2006-04-24
| | | | | | the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18238 b3059339-0415-0410-9bf9-f77b7e298cf2
* Convert printfs in aviprint.c to mp_msg and give the information printingGravatar diego2006-03-27
| | | | | | | functions in this file a verbosity_level parameter. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17978 b3059339-0415-0410-9bf9-f77b7e298cf2
* Convert all if(verbose>X) to mp_msg_test calls.Gravatar diego2006-03-24
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17933 b3059339-0415-0410-9bf9-f77b7e298cf2
* in demux_ogg_read_packet initialize data to whole packet, reduces code andGravatar reimar2006-03-08
| | | | | | | fixes missing initialization in else + header packet case. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17786 b3059339-0415-0410-9bf9-f77b7e298cf2
* Second-try commit of this patch.Gravatar corey2006-02-17
| | | | | | | | | | | | 1. Include audio_delay as an argument to demux_seek. 2. Modify demux_seek_avi to adjust the audio/video stream positions so that mplayer/mencoder will instantly be in sync even when -delay is specified. I've quadruple checked this time; hopefully I haven't missed anything. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17637 b3059339-0415-0410-9bf9-f77b7e298cf2
* Patch by Stefan Huehner / stefan % huehner ! org \Gravatar rathann2006-02-09
| | | | | | | | | | | | | | | | | | | | | | patch replaces '()' for the correct '(void)' in function declarations/prototypes which have no parameters. The '()' syntax tell thats there is a variable list of arguments, so that the compiler cannot check this. The extra CFLAG '-Wstrict-declarations' shows those cases. Comments about a similar patch applied to ffmpeg: That in C++ these mean the same, but in ANSI C the semantics are different; function() is an (obsolete) K&R C style forward declaration, it basically means that the function can have any number and any types of parameters, effectively completely preventing the compiler from doing any sort of type checking. -- Erik Slagter Defining functions with unspecified arguments is allowed but bad. With arguments unspecified the compiler can't report an error/warning if the function is called with incorrect arguments. -- Måns Rullgård git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix crash with invalid -vid and no audio streamGravatar reimar2005-12-18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17219 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixGravatar rathann2005-12-05
| | | | | | | demux_ogg.c:371: warning: implicit declaration of function '_ilog' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17091 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unify include path handling, -I.. is in CFLAGS.Gravatar diego2005-11-18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17013 b3059339-0415-0410-9bf9-f77b7e298cf2
* Speex support. Seeking and pts generation does not work.Gravatar reimar2005-11-05
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16916 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix two (loosely) related bugs: massive A-V desync with -audiofile (bugzillaGravatar reimar2005-11-01
| | | | | | | | bug #375, sh_audio->delay must only be set when seeking, not at every packet) and not switching to the next file when seeking hits eof. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16885 b3059339-0415-0410-9bf9-f77b7e298cf2
* move resync_audio_stream after seeking to demuxer.cGravatar reimar2005-10-30
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16878 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use PRI?64 defines as format strings for 64 bit variables.Gravatar reimar2005-10-13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16751 b3059339-0415-0410-9bf9-f77b7e298cf2
* Don't pass NULL pointers to demux_info_add()Gravatar rtognimp2005-09-26
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16605 b3059339-0415-0410-9bf9-f77b7e298cf2
* Disassemble comments and pass it to the demux_info interfaceGravatar alex2005-09-19
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16538 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make -identify's 'ID_LENGTH=' print a float and not an integer.. TheGravatar ods152005-09-02
| | | | | | | | 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
* Demuxer modularizationGravatar rtognimp2005-08-05
| | | | | | | Demuxer selection by name with -demuxer command (bakward compatible) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16176 b3059339-0415-0410-9bf9-f77b7e298cf2
* prevent possible exploitGravatar nicodvb2005-05-13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15427 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixup the correct sh_aGravatar nicodvb2005-05-12
| | | | 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 ↵Gravatar nicodvb2005-05-12
| | | | | | 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 audioGravatar nicodvb2005-05-12
| | | | 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 wayGravatar nicodvb2005-05-12
| | | | 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 calledGravatar reimar2005-05-02
| | | | | | | 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) ↵Gravatar mosu2005-05-01
| | | | | | 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!!!Gravatar rfelker2005-02-27
| | | | | | | | | | | | | | | | | 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:Gravatar henry2005-02-22
| | | | | | | | | - 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).Gravatar reimar2005-02-06
| | | | 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 ↵Gravatar mosu2005-01-22
| | | | | | 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.Gravatar mosu2005-01-21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14563 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l, completely broken pointer arithmetic causing crashes.Gravatar reimar2005-01-19
| | | | 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 ↵Gravatar mosu2004-11-25
| | | | | | -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.Gravatar mosu2004-11-05
| | | | 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 ↵Gravatar mosu2004-10-30
| | | | | | 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 fixedGravatar reimar2004-10-14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13642 b3059339-0415-0410-9bf9-f77b7e298cf2
* show ogg subtitle language on OSD, if availableGravatar joey2004-09-28
| | | | 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 ↵Gravatar joey2004-09-28
| | | | | | 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 ↵Gravatar mosu2004-08-24
| | | | | | instead. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13128 b3059339-0415-0410-9bf9-f77b7e298cf2
* moved combined vobsub_lang into sub_selectGravatar joey2004-08-22
| | | | | | | | | 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.Gravatar reimar2004-07-28
| | | | | | | 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 ↵Gravatar mosu2004-06-27
| | | | | | 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/)Gravatar henry2004-05-08
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12444 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics. Shortened the "displaying subtitle..." message. Replaced "OGG" ↵Gravatar mosu2004-05-07
| | | | | | 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 ↵Gravatar mosu2004-05-05
| | | | | | (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 ↵Gravatar mosu2004-04-29
| | | | | | 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 bunkusGravatar rfelker2004-04-23
| | | | 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 ↵Gravatar mosu2004-04-23
| | | | | | 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 ↵Gravatar mosu2004-04-23
| | | | | | hu-berlin anotherdot de> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12264 b3059339-0415-0410-9bf9-f77b7e298cf2