summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.h
Commit message (Collapse)AuthorAgeFilesLines
* Do not use leading underscores in multiple inclusion guards, they are reserved.diego2007-07-021-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23709 b3059339-0415-0410-9bf9-f77b7e298cf2
* make opt argument of demux_info_get const.reimar2007-06-241-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23631 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix demuxer.h multiple inclusion guarduau2007-06-201-2/+2
| | | | | | | | The "#ifndef __DEMUXER_H" / "#endif" pair did not cover the whole file. Move the #endif to the last line. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23591 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use 'static inline' instead of 'inline static' to avoid warningszuxy2007-06-041-8/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23461 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make realloc_struct inline as other functions defined in demuxer.hzuxy2007-06-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23451 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add lavf_preferred demuxer for lavf formats we want to be probedreimar2007-04-141-1/+2
| | | | | | | | before our native demuxers and remove some now unneeded file-extension hacks. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22989 b3059339-0415-0410-9bf9-f77b7e298cf2
* Another round of subtitle code cleanupreimar2007-02-051-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22155 b3059339-0415-0410-9bf9-f77b7e298cf2
* added stream_pts to demuxer_t and demux_packet_t to hold the time value ↵nicodvb2006-12-311-0/+3
| | | | | | reported by the stream layer git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21796 b3059339-0415-0410-9bf9-f77b7e298cf2
* new DEMUXER_CTRL_IDENTIFY_PROGRAM to identify programs (a+v+s)nicodvb2006-11-181-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21021 b3059339-0415-0410-9bf9-f77b7e298cf2
* added code to switch video streamnicodvb2006-11-161-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20964 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move sh_sub_t to stheader.h, where all the other sh structs are definedreimar2006-11-131-14/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20892 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make subtitle stream handling more similar to audio and video streams.reimar2006-11-131-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20888 b3059339-0415-0410-9bf9-f77b7e298cf2
* added demuxer_get_current_time() to get the current playtime (possibly aided ↵nicodvb2006-11-071-0/+1
| | | | | | by the stream layer) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20765 b3059339-0415-0410-9bf9-f77b7e298cf2
* added definition of DEMUXER_CTRL_RESYNCnicodvb2006-11-071-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20763 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add demux_nut to MPlayer repoods152006-09-171-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19867 b3059339-0415-0410-9bf9-f77b7e298cf2
* demuxer_seek_chapter() returns informations about chapters count and namenicodvb2006-08-211-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19484 b3059339-0415-0410-9bf9-f77b7e298cf2
* added first revision of demuxer_seek_chapter()nicodvb2006-08-181-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19441 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add matroska chapter seeking capability.eugeni2006-08-061-0/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19348 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
* Initial libass release (without mencoder support).eugeni2006-07-071-1/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18942 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename mkv_sh_sub_t to sh_sub_t, move it to demuxer.h.eugeni2006-07-071-0/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18939 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a new video pts tracking mode, enabled by option -correct-pts.uau2006-07-061-1/+5
| | | | | | | | | | | | | | This mode has the following differences: - Video timing is correct for streams with B frames, at least with some demuxers. - Video filters can modify frame timestamps and insert new frames, and removing frames is handled better than before. - Some things are known to break, it's not usable as the default yet. Things should work as before when the -correct-pts option is not used. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18922 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix potential integer overflows in memory allocation.rtogni2006-06-041-0/+12
| | | | | | | Patch by Rich and me git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18559 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change common pts variables from floats to doubles. Individual demuxersuau2006-04-271-4/+4
| | | | | | | should be changed later. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18310 b3059339-0415-0410-9bf9-f77b7e298cf2
* 4 - Implement a better way to calculate current audio pts and use it forrtognimp2006-04-241-0/+1
| | | | | | | | | audio decoded with ad_libvorbis, ad_ffmpeg and ad_faad. Patch by Uoti Urpala git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18243 b3059339-0415-0410-9bf9-f77b7e298cf2
* 3 - Move a definition of MP_NOPTS_VALUE from muxer.h to demuxer.h tortognimp2006-04-241-4/+1
| | | | | | | | | make it available in more files (needed for next patch). Patch by Uoti Urpala git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18242 b3059339-0415-0410-9bf9-f77b7e298cf2
* Second-try commit of this patch.corey2006-02-171-2/+2
| | | | | | | | | | | | 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
* do not forget to initialize dp->bufferhenry2006-02-121-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17612 b3059339-0415-0410-9bf9-f77b7e298cf2
* forgotten cast (blows on gcc4)henry2006-02-121-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17600 b3059339-0415-0410-9bf9-f77b7e298cf2
* add some sanity checks to new/resize_demux_packetreimar2006-02-121-4/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17598 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reverse commit of unfinished patch for passing audio_delay to the demuxers.corey2006-02-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17570 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1. Include audio_delay as an argument to demux_seek.corey2006-02-071-1/+1
| | | | | | | | | | | 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. Other demuxers could be modified similarly in the future. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17554 b3059339-0415-0410-9bf9-f77b7e298cf2
* function to read from a demuxer up to (and including) the specifiedreimar2006-01-171-0/+2
| | | | | | | 3-byte pattern. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17418 b3059339-0415-0410-9bf9-f77b7e298cf2
* add a demux_peekc function that allows to just "have a look" at the nextreimar2005-09-171-0/+3
| | | | | | | byte of data from the demuxer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16505 b3059339-0415-0410-9bf9-f77b7e298cf2
* faster mpg and much faster gxf demuxingreimar2005-09-031-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16370 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make -identify's 'ID_LENGTH=' print a float and not an integer.. Theods152005-09-021-1/+1
| | | | | | | | 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
* Allow forcing of demuxers and codecs by prepending '+'reimar2005-08-301-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16322 b3059339-0415-0410-9bf9-f77b7e298cf2
* support MPEG in GXF container with extension-based detection.reimar2005-08-261-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16311 b3059339-0415-0410-9bf9-f77b7e298cf2
* Demuxer modularizationrtognimp2005-08-051-2/+37
| | | | | | | Demuxer selection by name with -demuxer command (bakward compatible) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16176 b3059339-0415-0410-9bf9-f77b7e298cf2
* musepack demuxing and decoding support (demuxing is v7 bitstream only).reimar2005-07-101-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15959 b3059339-0415-0410-9bf9-f77b7e298cf2
* added AAC ADTS demuxernicodvb2005-06-131-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15721 b3059339-0415-0410-9bf9-f77b7e298cf2
* adds a parameter to the switch_audio command to directly select a track.reimar2005-04-281-1/+1
| | | | | | | Patch by kiriuja mplayer-patches at en-directo net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15286 b3059339-0415-0410-9bf9-f77b7e298cf2
* Added support of audio stream switching in the MPEG demuxer using the #-keygpoirier2005-04-031-0/+2
| | | | | | | | Patch by Michael Behrisch < behrisch $ informatik * hu-berlin * de > commited with the kind blessing of D. Richard Felker III git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15047 b3059339-0415-0410-9bf9-f77b7e298cf2
* avisynth demuxer patch by Gianluigi Tiesi <mplayer at netfarm.it>faust32005-02-131-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14694 b3059339-0415-0410-9bf9-f77b7e298cf2
* TwinVQ decoder and demuxerrtognimp2004-12-291-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14277 b3059339-0415-0410-9bf9-f77b7e298cf2
* disable demuxer_bmp,iive2004-12-151-1/+0
| | | | | | | | that works with signle image in single file. removing is part of vu1nerabi1ity fix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14161 b3059339-0415-0410-9bf9-f77b7e298cf2
* merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TSnicodvb2004-11-241-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14035 b3059339-0415-0410-9bf9-f77b7e298cf2
* show ogg subtitle language on OSD, if availablejoey2004-09-281-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13503 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not use globals. Put the variables into the appropriate demuxer struct ↵mosu2004-08-241-0/+6
| | | | | | instead. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13128 b3059339-0415-0410-9bf9-f77b7e298cf2
* nsv (Nullsoft streaming video) demuxerrtognimp2004-04-121-1/+2
| | | | | | | Patch by Reza Jelveh <reza (dot) jelveh (at) tu-harburg (dot) de> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12176 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_lavfmichael2004-04-111-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12165 b3059339-0415-0410-9bf9-f77b7e298cf2
* LML-M4 mpeg4 capture card raw stream format supportarpi2003-12-081-2/+2
| | | | | | | | original code by Maxim Yevtyushkin <max@linuxmedialabs.com> partially rewritten, "mplayerized" by me git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11591 b3059339-0415-0410-9bf9-f77b7e298cf2
* Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>alex2003-10-221-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11235 b3059339-0415-0410-9bf9-f77b7e298cf2
* Proper demuxer number for the MPEG4-in-TS demuxer. Patch by Nico ↵mosu2003-08-291-2/+6
| | | | | | <nsabbi@libero.it>. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10716 b3059339-0415-0410-9bf9-f77b7e298cf2
* Updated highest demuxer number.mosu2003-08-281-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10711 b3059339-0415-0410-9bf9-f77b7e298cf2
* - initial support for MPEG4 in TS (M4V is working, but not AAC yet)arpi2003-08-241-0/+16
| | | | | | | patch by Nico <nsabbi@libero.it> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10688 b3059339-0415-0410-9bf9-f77b7e298cf2
* TiVo demuxer and sub-cc/osd decoderarpi2003-06-091-1/+2
| | | | | | | | | | | | | patch by usenet@wingert.org (http://tivo-mplayer.sourceforge.net/releases/MPlayer-20030501-tivo-patch.gz) changes by me: - spit demux_ty to demux_ty and demux_ty_osd (later handles mpeg user-data decoding, ie sub-cc and osd) - removed some cosmetics changes - some compile fixes (gcc3 specific variable decl etc) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10264 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add support for Realaudio filesrtognimp2003-04-301-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10034 b3059339-0415-0410-9bf9-f77b7e298cf2
* Added Matroska demuxing support.mosu2003-04-301-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10025 b3059339-0415-0410-9bf9-f77b7e298cf2
* H264-ES demuxermichael2003-04-041-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9825 b3059339-0415-0410-9bf9-f77b7e298cf2
* this is a combo patch that:arpi2003-03-161-1/+2
| | | | | | | | | | | | 1) adds an experimental TS demuxer to mplayer 2) adds an input (streaming) interface from DVB cards. It compiles and runs with the following versions of the drivers: dvb-kernel (HEAD) (with stock kernel 2.4.20) and 0.9.4 (with kernel 2.4.18) patch by Nico <nsabbi@libero.it> some cleanups, ts demuxer fixes by me git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9611 b3059339-0415-0410-9bf9-f77b7e298cf2
* libgif/libungif based demuxer support for libmpdemux.arpi2003-01-281-1/+2
| | | | | | | patch by Joey Parrish <joey@nicewarrior.org> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9130 b3059339-0415-0410-9bf9-f77b7e298cf2
* raw mpeg4-es support (you need to set -fps manually!)arpi2003-01-231-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9070 b3059339-0415-0410-9bf9-f77b7e298cf2
* raw video demuxer, requested by Michaelarpi2003-01-221-1/+2
| | | | | | | (try mplayer -rawvideo on:cif mobile.cif) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9066 b3059339-0415-0410-9bf9-f77b7e298cf2
* extension-based filetype detection for headerless files (mp3 vs mpeg, etc)arpi2003-01-191-1/+5
| | | | | | | inspired by patch by Fabian Franz <FabianFranz@gmx.de> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9007 b3059339-0415-0410-9bf9-f77b7e298cf2
* XMMS Input plugin supportarpi2002-12-221-0/+1
| | | | | | | | based on patches by Balatoni Denes <pnis@coder.hu> changes by me: glib dependency removed, files merged, code simplified, some bugfixes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8529 b3059339-0415-0410-9bf9-f77b7e298cf2
* demuxer_control(), percent position and time length query implemented inarpi2002-11-161-0/+12
| | | | | | | | asf, avi, mpeg demuxers. patch by Balatoni Denes <pnis@coder.hu> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8209 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,arpi2002-11-021-7/+0
| | | | | | | | instead doing it in demux_avi.c, storing private data in priv insteda of demuxer structs) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8031 b3059339-0415-0410-9bf9-f77b7e298cf2
* fill the extra bytes with zeroarpi2002-10-171-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7777 b3059339-0415-0410-9bf9-f77b7e298cf2
* ds_tell_block()arpi2002-10-161-1/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7749 b3059339-0415-0410-9bf9-f77b7e298cf2
* added smjpeg demuxer only for nexus' requestalex2002-09-131-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7383 b3059339-0415-0410-9bf9-f77b7e298cf2
* .PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxerarpi2002-09-101-1/+2
| | | | | | | slightly modified patch, original by Matteo Giani <matgiani@ctonet.it> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7365 b3059339-0415-0410-9bf9-f77b7e298cf2
* raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>arpi2002-08-051-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6926 b3059339-0415-0410-9bf9-f77b7e298cf2 </