summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_ogg.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r29912Uoti Urpala2009-11-161-19/+34
|\
| * Find and take into account stream start time for ogg files.reimar2009-10-161-19/+34
| | | | | | | | | | | | | | | | | | | | | | This also makes the demuxing function set the keyframe flag for vorbis packets that aren't header packets and have a time stamp, even if we do not have vorbis_info struct yet. The reason for this is that header packets always have 0 as time stamp. Fixes bug #1585 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29776 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Replace libavutil internal header #includes with MPlayer copiesUoti Urpala2009-07-261-1/+1
| | | | | | | | | | | | Change #include lines for libavutil/intreadwrite.h, libavutil/bswap.h and libavutil/x86_cpu.h to use the MPlayer file under ffmpeg_files/ instead.
* | Merge svn changes up to r29412Uoti Urpala2009-07-071-1/+1
|\|
| * 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
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-23/+23
| |
* | Merge svn changes up to r29304Uoti Urpala2009-07-071-0/+17
|\|
| * 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
* | Merge svn changes up to r28087Uoti Urpala2008-12-041-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: command.c libao2/ao_ivtv.c libao2/ao_v4l2.c libmpcodecs/dec_video.h libvo/aspect.h libvo/sub.c libvo/sub.h libvo/vo_directx.c libvo/vo_macosx.m libvo/vo_quartz.c mp_core.h mplayer.c mplayer.h osdep/getch2.h osdep/timer.h
| * 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
* | Make various functions staticUoti Urpala2008-08-121-2/+2
| |
* | Merge svn changes up to r27441Uoti Urpala2008-08-081-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h command.c configure input/input.c libmpcodecs/dec_video.c libmpcodecs/vd.c libmpdemux/stheader.h libvo/sub.c libvo/video_out.c libvo/vo_xv.c libvo/vosub_vidix.c libvo/x11_common.c libvo/x11_common.h mp_core.h mplayer.c stream/stream.h
| * 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
* | Merge svn changes up to r27399Uoti Urpala2008-08-021-9/+9
|\| | | | | | | | | | | | | | | | | | | Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
| * 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
* | Merge svn changes up to r27374Uoti Urpala2008-07-301-28/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h cfg-mplayer.h command.c configure libmpcodecs/dec_video.c libmpcodecs/vd.c libmpcodecs/vf_vo.c libmpdemux/demuxer.h libmpdemux/stheader.h mp_core.h mplayer.c stream/stream_radio.c
| * 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
* | Move dvdsub_id to options structUoti Urpala2008-04-231-2/+2
| | | | | | | | | | | | | | Name the field "sub_id" as it's not specific to DVD subs. Remove some other unused extern declarations together with dvdsub_id from demux_mkv.c and demux_lavf.c.
* | Add option pointer to demuxers and stheader.h structsUoti Urpala2008-04-231-1/+2
|/
* 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
*