summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
Commit message (Collapse)AuthorAgeFilesLines
* Cosmetics: indentation fix indentation broken by last two demuxer.c commitsreimar2006-10-201-25/+25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20325 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix opening of demuxers without check_file function, broken by r20309.reimar2006-10-201-3/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20324 b3059339-0415-0410-9bf9-f77b7e298cf2
* Try other demuxers if open() fails.reimar2006-10-191-22/+18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20309 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify: replace malloc + memset 0 by callocreimar2006-10-051-4/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20078 b3059339-0415-0410-9bf9-f77b7e298cf2
* conditional declerations are unnecessaryods152006-09-171-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19868 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add demux_nut to MPlayer repoods152006-09-171-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19867 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of demux_aid_vid_mismatch mess.reimar2006-08-261-12/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19546 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l: *chapter_name was copied from the pointer rather than strupd()-ed (and ↵nicodvb2006-08-211-2/+5
| | | | | | next free()d in mplayer.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19485 b3059339-0415-0410-9bf9-f77b7e298cf2
* demuxer_seek_chapter() returns informations about chapters count and namenicodvb2006-08-211-1/+24
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19484 b3059339-0415-0410-9bf9-f77b7e298cf2
* clarification in a commentnicodvb2006-08-181-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19445 b3059339-0415-0410-9bf9-f77b7e298cf2
* support relative seeking in the stream-driven casenicodvb2006-08-181-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19444 b3059339-0415-0410-9bf9-f77b7e298cf2
* added first revision of demuxer_seek_chapter()nicodvb2006-08-181-0/+66
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19441 b3059339-0415-0410-9bf9-f77b7e298cf2
* Update information and print new value when demux_info_add is calledreimar2006-08-161-1/+3
| | | | | | | | twice for the same tag. Should show currently playing title with Ogg streams. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19419 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add matroska chapter seeking capability.eugeni2006-08-061-0/+20
| | | | 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
* Add a new video pts tracking mode, enabled by option -correct-pts.uau2006-07-061-4/+7
| | | | | | | | | | | | | | 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
* move some ill-behaving demuxers further down the listreimar2006-07-041-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18905 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change free_sh_audio() to take demuxer and stream id as parametersuau2006-06-141-4/+4
| | | | | | | | | | | | | | (same as new_sh_audio()) instead of sh_audio_t *, use those to remove the pointer from demuxer->a_streams[] before freeing it. Some demuxers use free_sh_audio() to undo the creation of an already-allocated audio stream in case of error. These uses were unsafe since free_sh_audio() freed the data structure but left the pointer in demuxer->a_streams[], leading to double free later in free_demuxer() (and perhaps use of the freed stream before that, I didn't check). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18711 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unconditionally compile the Matroska demuxer.diego2006-05-081-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18405 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change common pts variables from floats to doubles. Individual demuxersuau2006-04-271-2/+3
| | | | | | | 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/+21
| | | | | | | | | 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
* Get ride of the several if(identify) messy lines and rearangment of some of ↵reynaldo2006-04-241-12/+8
| | | | | | 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
* fixes decoding demoscene.tv nsv at http://213.186.36.129:8000gpoirier2006-04-171-1/+1
| | | | | | | Fix suggested by Reimar, patch by RC. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18129 b3059339-0415-0410-9bf9-f77b7e298cf2
* Convert all if(verbose>X) to mp_msg_test calls.diego2006-03-241-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17933 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
* 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/+35
| | | | | | | 3-byte pattern. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17418 b3059339-0415-0410-9bf9-f77b7e298cf2
* massive attack: mp_msg printf format fixesrathann2006-01-121-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17367 b3059339-0415-0410-9bf9-f77b7e298cf2
* added support for external libavformatnicodvb2006-01-091-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17355 b3059339-0415-0410-9bf9-f77b7e298cf2
* include fastmemcpy.h before stream.h, so it is used for the stream_readreimar2005-12-171-1/+2
| | | | | | | function, too. Gives a small speedup for e.g. high bandwidth MPEG2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17201 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unify include path handling, -I.. is in CFLAGS.diego2005-11-181-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17013 b3059339-0415-0410-9bf9-f77b7e298cf2
* estimate total time also for audio-only files.reimar2005-11-061-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16926 b3059339-0415-0410-9bf9-f77b7e298cf2
* move resync_audio_stream after seeking to demuxer.creimar2005-10-301-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16878 b3059339-0415-0410-9bf9-f77b7e298cf2
* "LIVE.COM Streaming Media" is now called "LIVE555 Streaming Media".rsf2005-09-231-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16573 b3059339-0415-0410-9bf9-f77b7e298cf2
* Prints -identify output for:gpoirier2005-09-191-0/+2
| | | | | | | | | | - video codec of the current file; - signal numbers; - demuxer help header. Patch by kiriuja <mplayer DATH patches AH en DATH directo POIS net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16523 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make the fourcc output endianness-independent.diego2005-09-131-2/+4
| | | | | | | patch by Luca Barbato < lu_zero -- at -- gentoo -- at -- org > git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16478 b3059339-0415-0410-9bf9-f77b7e298cf2
* execute the check function even when a demuxer is forced, to avoid crashes.reimar2005-09-061-2/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16414 b3059339-0415-0410-9bf9-f77b7e298cf2
* Forgotten mpc demuxerreimar2005-09-061-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16413 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make -identify's 'ID_LENGTH=' print a float and not an integer.. Theods152005-09-021-3/+3
| | | | | | | | 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
* Fix move playlists (control must be returned to mplayer.c, with the demuxerreimar2005-08-311-0/+4
| | | | | | | returning the real URL as a packet). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16327 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow forcing of demuxers and codecs by prepending '+'reimar2005-08-301-13/+32
| | | | 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-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16311 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not free demuxer before using demuxer->desc->type (happened when using ↵reimar2005-08-231-1/+2
| | | | | | -audiofile). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16292 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix brokeness caused by demuxer patch, this code is useless forods152005-08-111-1/+0
| | | | | | | | any case other than avi and should not be run even then. patch by Uoti Urpala (urpala BANG cc MEEP helsinki MEEP fi) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16199 b3059339-0415-0410-9bf9-f77b7e298cf2
* Demuxer modularizationrtognimp2005-08-051-1097/+269
| | | | | | | Demuxer selection by name with -demuxer command (bakward compatible) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16176 b3059339-0415-0410-9bf9-f77b7e298cf2
* remove unused cache-prefill and create cache-seek-min that controls when ↵iive2005-07-311-2/+2
| | | | | | seek_long is prefered over waiting for cache to fill git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16153 b3059339-0415-0410-9bf9-f77b7e298cf2
* musepack demuxing and decoding support (demuxing is v7 bitstream only).reimar2005-07-101-0/+23
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15959 b3059339-0415-0410-9bf9-f77b7e298cf2
* -identify variable names should follow [A-Z_][A-Z0-9_]* conventionranma2005-07-071-2/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15939 b3059339-0415-0410-9bf9-f77b7e298cf2
* adds some more -identify output, patch by kiriuja < mplayer DASH patches PAM ↵gpoirier2005-06-201-0/+4
| | | | | | en DASH directo POUM net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15790 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix memleak when playing mov filesreimar2005-06-201-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15781 b3059339-0415-0410-9bf9-f77b7e298cf2
* added AAC ADTS demuxernicodvb2005-06-131-0/+22
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15721 b3059339-0415-0410-9bf9-f77b7e298cf2
* moved mpeg-ps/es probing code to demux_mpg.cnicodvb2005-06-061-102/+17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15671 b3059339-0415-0410-9bf9-f77b7e298cf2
* setting sh_audio to NULL is nonsense, since it is only a local variable,reimar2005-05-271-6/+6
| | | | | | | | | use d_audio->sh instead. Fixes crash for incoming/VTS_01_1_orig.VOB, though it still doesn't select the other audio stream automatically. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15577 b3059339-0415-0410-9bf9-f77b7e298cf2
* revert one line of version 1.182 patch (caused use of already-freedrfelker2005-04-291-1/+1
| | | | | | | | | | memory and multiple double-free errors). i am fairly confident that all the relevant memory is now freed once and exactly once, but it's better than corrupting the heap in any case. 100l to reimar :) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15298 b3059339-0415-0410-9bf9-f77b7e298cf2
* adds a parameter to the switch_audio command to directly select a track.reimar2005-04-281-4/+5
| | | | | | | 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-27/+6
| | | | | | | | 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
* Rather simple patch for RAWDV demuxer which lets it say whats the totalrtognimp2005-03-091-0/+7
| | | | | | | | movie length. Patch by Oded Shimon git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14935 b3059339-0415-0410-9bf9-f77b7e298cf2
* avisynth demuxer patch by Gianluigi Tiesi <mplayer at netfarm.it>faust32005-02-131-2/+54
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14694 b3059339-0415-0410-9bf9-f77b7e298cf2
* Memleak fixes. Based on patch by Timothy Lee (timothy lee at siriushk com).reimar2005-02-061-5/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14667 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move generic length and percent pos calculation to demuxer.creimar2005-01-151-2/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14503 b3059339-0415-0410-9bf9-f77b7e298cf2
* TwinVQ decoder and demuxerrtognimp2004-12-291-0/+26
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14277 b3059339-0415-0410-9bf9-f77b7e298cf2
* removing AFMT_ dependancyalex2004-12-271-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14246 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use demuxer_get_percent_pos for the OSD position barreimar2004-12-211-4/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14198 b3059339-0415-0410-9bf9-f77b7e298cf2
* disable demuxer_bmp,iive2004-12-151-22/+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
* Output more information about vids, aids, sids, alangs and slangs with ↵mosu2004-11-251-0/+10
| | | | | | -identify. Patch by kiriuja <mplayer-patches@en-directo.net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14047 b3059339-0415-0410-9bf9-f77b7e298cf2
* merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TSnicodvb2004-11-241-6/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14035 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reduce excessive verbosity.diego2004-11-151-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13947 b3059339-0415-0410-9bf9-f77b7e298cf2
* seeking based on the largest timestamp in an mpeg streamaurel2004-10-231-1/+5
| | | | | | | | | It is often more accurate than the current seeking and it has the additional benefit of giving the (almost) precise total time of the movie. patch by Michael Behrisch < behrisch at informatik.hu-berlin.de > git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13739 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove redundant ASF status line, there is another for all formats.diego2004-10-191-5/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13687 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix segfault for unexistant/unreachable rtsp streamsrtognimp2004-10-181-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13674 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support ON2 variation of AVI format (.vp5 files)rtognimp2004-10-081-1/+5
| | | | | | | Also closes bug #104 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13589 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixed small memleakreimar2004-10-011-3/+4