summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_ogg.c
Commit message (Collapse)AuthorAgeFilesLines
* In all demux_info_add calls change "name" to "title".reimar2009-05-301-1/+1
| | | | | | | | | Currently "name" and "title" are both used at random, this makes it consistent. "title" was chosen because it is less ambiguous and also the get_meta_title slave mode command uses that (there is no get_meta_name command). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29330 b3059339-0415-0410-9bf9-f77b7e298cf2
* whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-23/+23
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add standard license header to all files in libmpdemux.diego2009-05-081-0/+17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29280 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of pointless 'extern' keywords.diego2008-12-031-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
* Give a CONFIG_ prefix to preprocessor directives that lacked one anddiego2008-08-071-1/+1
| | | | | | | change arbitrary prefixes to CONFIG_. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename font-related preprocessor directives.diego2008-08-071-3/+3
| | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change a bunch of codec-specific preprocessor directives from a HAVE_diego2008-08-021-6/+6
| | | | | | | prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27395 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate;diego2008-08-011-3/+3
| | | | | | | CONFIG_ prefix for configurable options, HAVE_ for system-dependent stuff. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27391 b3059339-0415-0410-9bf9-f77b7e298cf2
* Start unifying names of internal preprocessor directives.diego2008-07-301-3/+3
| | | | | | | | Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of horrible code that relies on codec-set context variable,reimar2008-07-261-25/+8
| | | | | | | | it is useless anyway since all the necessary information is available anyway. This also makes MPlayer display the correct length for Theora-in-Ogg-Videos. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27354 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fill sh_sub_t.lang in lavf, mkv and ogg demuxers. Use it for printing subtitleeugeni2008-02-291-9/+4
| | | | | | | track language. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26116 b3059339-0415-0410-9bf9-f77b7e298cf2
* typo fix: inited --> initializeddiego2008-02-141-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use defines to give names to the different seek flags.reimar2008-01-291-4/+4
| | | | | | | | A better solution should be considered later, esp. for the many broken demuxers that do not treat these flags correctly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25911 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make all demuxer_desc_t const, thus moving them to .rodatareimar2008-01-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25735 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add some const/static qualifiers as appropriatereimar2007-12-241-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25523 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use realloc_struct in more places for consistencyreimar2007-12-241-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25522 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of some of the more excessive () and casts.reimar2007-12-241-24/+24
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25521 b3059339-0415-0410-9bf9-f77b7e298cf2
* Finally replace get_uint?? by AV_RL??reimar2007-12-011-35/+31
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25234 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of annoying, space-wasting sizeof(uint32_t)reimar2007-12-011-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25233 b3059339-0415-0410-9bf9-f77b7e298cf2
* Bigendian fix for ogg in AVIreimar2007-12-011-2/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25232 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use a loop instead of doing the same thing three timesreimar2007-12-011-14/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25231 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use a pointer variable for extradata to simplify init_avi_with_oggreimar2007-12-011-4/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25230 b3059339-0415-0410-9bf9-f77b7e298cf2
* Create correct extradata for vorbis audio when used as avi sub-demuxerreimar2007-12-011-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25227 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix some typos in comments, grammar is still bad.reimar2007-12-011-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25226 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove redundant variable declaration.diego2007-08-251-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24164 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: misc typo fixesdiego2007-07-281-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23893 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove extern index_mode, it is already in demuxer.hreimar2007-07-271-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23886 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some unused variables, patch by timwoj ieee org.diego2007-05-281-3/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23399 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reuse AV_RL macros in ogg demuxer instead of its own overcomplicated ↵reimar2007-05-171-49/+4
| | | | | | implementations of it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23330 b3059339-0415-0410-9bf9-f77b7e298cf2
* Ignore comments where no '=' follows the comment name (otherwisereimar2007-05-091-1/+2
| | | | | | | | | "album_ja=..." would result in "Album: ja=..." MPlayer output). Patch by Nicolas George [nicolas george [at] ens fr]. See thread: "[PATCH] Equals in Ogg comments", Mon, 5 Mar 2007 10:50:02 +0100 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23280 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add explicit location for headers from the stream/ directory.diego2007-03-151-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22623 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify demux_ogg to use the sub_clear_text and sub_add_text functions.reimar2007-01-061-40/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21846 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify after last demux_ogg commitreimar2007-01-051-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21830 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not access ogg_d->subs after freeing it.reimar2007-01-051-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21829 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of min/max macros from aviheader.h, they do not belong here.reimar2006-12-091-1/+1
| | | | | | | Replace their uses by FFMIN/FFMAX git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21547 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove condition that should always be truereimar2006-12-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21545 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix crash in ogg demuxer uninit with -aidreimar2006-12-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21544 b3059339-0415-0410-9bf9-f77b7e298cf2
* made vorbis_info a member of ogg_stream rather than ogg_demuxer;nicodvb2006-12-071-11/+17
| | | | | | | this change paves the way for multi audio track support git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21535 b3059339-0415-0410-9bf9-f77b7e298cf2
* vorbis_comment is only used locally, move it out of demuxer structreimar2006-12-071-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21525 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused ov_struct_treimar2006-12-071-14/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21524 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix memleaks caused by missing vorbis/theora_info/comment_clear calls.reimar2006-12-061-0/+4
| | | | | | | | Code still seems wrong to me for multiple audio tracks, since there is only one vorbis comment/info entry for the demuxer, not one per track? git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21516 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l, compilation error in r21054reimar2006-11-191-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21055 b3059339-0415-0410-9bf9-f77b7e298cf2
* Generalize subtitle switching, demux_ogg does not need a special casereimar2006-11-191-12/+2
| | | | | | | anymore and demux_mov works now, too. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21054 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make -slang work again, sub->id is -2 by default, so -slang would be ignoredreimar2006-11-191-1/+1
| | | | | | | with old code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21052 b3059339-0415-0410-9bf9-f77b7e298cf2
* Create a sh_sub_t for ogg subtitles.reimar2006-11-191-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21051 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make sure we do not read beyond end of subtitle packetreimar2006-10-291-1/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20510 b3059339-0415-0410-9bf9-f77b7e298cf2
* realloc subtitle buffers since subcp_recode might have decreased their size.reimar2006-10-291-10/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20509 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support new flac-in-ogg, fixes bug #229reimar2006-10-291-0/+15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20505 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove #ifdef HAVE_FLAC, it was never needed and nowadays is never defined.reimar2006-10-211-4/+0
| | | | | | | Fixes http://samples.mplayerhq.hu/ogg/old_flac_in_ogg_flac_1_0_4.ogg git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20335 b3059339-0415-0410-9bf9-f77b7e298cf2
* redone subcp_recode: get rid of static buffer, skip lines that failed toreimar2006-10-181-1/+1
| | | | | | | | convert instead of removing all remaining lines and remove subcp_recode1 since subcp_recode should now work just as well. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20298 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support for variable fps OGM files, blessed by Moritz.diego2006-09-121-0/+3
| | | | | | | patch by Sergey Khlutchin, Elphel, Inc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19808 b3059339-0415-0410-9bf9-f77b7e298cf2
* in fixup_vorbis_wf() set to 0 bitrates indicated as -1 (unspecified, ↵nicodvb2006-09-051-1/+10
| | | | | | according to the specs); patch by Andrew Savchenko - Bircoph list ru git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19700 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of demux_aid_vid_mismatch mess.reimar2006-08-261-18/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19546 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move store_ughvlc to demux_mov as demux_ogg is not always compiled in.diego2006-08-041-16/+3
| | | | | | | inspired by a patch from Emanuele Giaquinta, emanuele.giaquinta %@% gmail.com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19332 b3059339-0415-0410-9bf9-f77b7e298cf2
* marks several strings inside structs as const when they hold just reynaldo2006-07-161-3/+3
| | | | | | | | | read-only information and modifies GetLanguage in Gui/mplayer/gtk/menu.c to cope which the changes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19115 b3059339-0415-0410-9bf9-f77b7e298cf2
* marks several string parameters as const, as they are not modified inside ↵reynaldo2006-07-131-1/+1
| | | | | | the function, Patch by Stefan Huehner, stefan AT huehner-org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19058 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused variables, patch by Stefan Huehner stefan at huehner org.diego2006-07-081-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18963 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move conditional compilation into the build system.diego2006-07-061-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18927 b3059339-0415-0410-9bf9-f77b7e298cf2
* rm unnecesary casts from void* - part 4reynaldo2006-07-031-11/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18890 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix crash with all audio-only ogg files, the vorbis_info struct is notreimar2006-06-171-1/+1
| | | | | | | stored in the sh_audio context but in the demuxer priv element git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18740 b3059339-0415-0410-9bf9-f77b7e298cf2
* Clean up audio pts handling, make audio pts tracking in the audio-onlyuau2006-06-141-2/+0
| | | | | | | case work the same as with video. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18713 b3059339-0415-0410-9bf9-f77b7e298cf2
* moved store_ughvlc() before #ifdef HAVE_OGGVORBIS, so it can be used by ↵nicodvb2006-06-091-16/+16
| | | | | | other demuxers when libogg and/or libvorbis are missing git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18670 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for vorbis in mp4/movnicodvb2006-06-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18668 b3059339-0415-0410-9bf9-f77b7e298cf2
* first vorbis packet before vorbis_synthesis_headeri() must have b_o_s==1nicodvb2006-06-071-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18638 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix potential integer overflows in memory allocation.rtogni2006-06-041-1/+1
| | | | | | | Patch by Rich and me git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18559 b3059339-0415-0410-9bf9-f77b7e298cf2
* accidentally committed this overflow fix with the declaration fix before.rfelker2006-05-131-1/+1
| | | | | | | | 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++ declarationsrfelker2006-05-131-2/+5
| | | | 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 ↵nicodvb2006-05-101-6/+27
| | | | | | 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 ↵reynaldo2006-04-241-25/+13
| | | | | | 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 printingdiego2006-03-271-9/+9
| | | | | | | 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.diego2006-03-241-5/+5
| | | | 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 andreimar2006-03-081-5/+2
| | | | | | | 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.corey2006-02-171-1/+1
| | | | | | | | | | | | 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 \rathann2006-02-091-1/+1
| | | | | | | | | |