summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
Commit message (Collapse)AuthorAgeFilesLines
* Give a CONFIG_ prefix to preprocessor directives that lacked one anddiego2008-08-071-2/+2
| | | | | | | change arbitrary prefixes to CONFIG_. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l: MUSEPACK --> CONFIG_MUSEPACKdiego2008-08-071-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27427 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename a bunch of miscellaneous preprocessor directives.diego2008-08-071-1/+1
| | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27423 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename preprocessor directives related to image libraries.diego2008-08-051-1/+1
| | | | | | | Change a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27417 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change a bunch of codec-specific preprocessor directives from a HAVE_diego2008-08-021-3/+3
| | | | | | | prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27395 b3059339-0415-0410-9bf9-f77b7e298cf2
* Start unifying names of internal preprocessor directives.diego2008-07-301-9/+9
| | | | | | | | 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
* Avoid including avcodec.h in demuxer.h (and thus many other files) just to getreimar2008-07-171-0/+7
| | | | | | | | | FF_INPUT_BUFFER_PADDING_SIZE. Instead use MP_INPUT_BUFFER_PADDING_SIZE and add a preprocessor check that it is big enough. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27314 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Remove useless parentheses, align.diego2008-06-161-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27091 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support NULL name parameter for demuxer_add_chapter.reimar2008-06-161-1/+1
| | | | | | | Patch by Anton Khirnov [wyskas gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27089 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Break overly long lines.diego2008-06-161-97/+178
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27088 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: indentation, whitespace changesdiego2008-06-161-648/+645
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27087 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: consistent * placementdiego2008-06-161-21/+21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27086 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: one more if brace placement fixdiego2008-06-161-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27085 b3059339-0415-0410-9bf9-f77b7e298cf2
* M-x untabifydiego2008-06-161-24/+24
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27084 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Remove all trailing whitespace.diego2008-06-161-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27083 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Split/join multiline statements.diego2008-06-161-4/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27082 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Consistently format all if, for, while constructs.diego2008-06-161-140/+170
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27081 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove one more commented-out line.diego2008-06-161-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27080 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Make all function declarations consistent by moving the openingdiego2008-06-161-42/+90
| | | | | | | braces to the next line and breaking long lines. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27079 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove one more commented-out line.diego2008-06-161-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27078 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove pointless comments and commented-out code.diego2008-06-161-19/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27077 b3059339-0415-0410-9bf9-f77b7e298cf2
* added and reused demux_flush() instead of emptying the demux_stream buffers;nicodvb2008-06-021-20/+10
| | | | | | | patch by Bryan Henderson - giraffedata gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26958 b3059339-0415-0410-9bf9-f77b7e298cf2
* Initialize sh_audio/sh_video->dsreimar2008-05-271-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26908 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify/make new_sh behaviour more consistent when a stream gets redefined.reimar2008-05-271-3/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26907 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: simplifyreimar2008-05-271-3/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26906 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move native musepack demuxer further down in demuxer listreimar2008-05-271-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26905 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Remove pointless parentheses from return statements.diego2008-05-161-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26790 b3059339-0415-0410-9bf9-f77b7e298cf2
* Revert r26411: policy violationrtogni2008-04-191-963/+812
| | | | | | | | | Reindent of the file is not allowed Controversial cosmetics changes with no previous discussion Mix cosmetics and non-cosmetic changes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26469 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reformat demuxer.cuau2008-04-121-812/+963
| | | | | | | | Indent with "indent -kr -l79 -nut" and fix various suboptimal results by hand. Also remove some commented-out cruft and one unnecessary case of parentheses as in "return (r)". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26411 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove global demuxer_typeuau2008-04-121-1/+1
| | | | | | | It was only used inside one function. Change it to a local variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26410 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused function demux_read_data_packuau2008-04-111-17/+0
| | | | | | | | According to VCS history this function has never been used since it was added in 2001... git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26401 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support 'default' attribute for audio and subtitle tracks.eugeni2008-03-301-0/+28
| | | | | | | | | The first default track is chosen for playback if language-based selection failes. Additionally, for audio tracks, the first one is chosen if there are no default tracks at all. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26301 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set audio->sh correctly when switching audio tracks. The same for video tracks.eugeni2008-02-291-0/+8
| | | | | | | | | Demuxers almost never update audio->sh or sub->sh when swithing tracks. It is especially bad when switching to no sound, and results in "too many audio packets" error. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26121 b3059339-0415-0410-9bf9-f77b7e298cf2
* Don't select subtitle track in lavf and mkv demuxers.eugeni2008-02-291-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26120 b3059339-0415-0410-9bf9-f77b7e298cf2
* Demuxer-independent functions for selecting tracks based on language.eugeni2008-02-291-0/+32
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26118 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove stupid checks of free() argument.eugeni2008-02-291-8/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26117 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add language info to sh_sub_t and sh_audio_t.eugeni2008-02-291-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26114 b3059339-0415-0410-9bf9-f77b7e298cf2
* in ds_fill_buffer() disabled the code that demuxes until the arrival of the ↵nicodvb2008-02-251-0/+2
| | | | | | right reference_clock git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26103 b3059339-0415-0410-9bf9-f77b7e298cf2
* New member in demuxer_t: reference_clock.nicodvb2008-02-231-0/+9
| | | | | | | | | | | | | If it's != MP_NOPTS_VALUE ds_fill_buffer() will keep on demuxing until the pts of the next_pts is <= reference_clock. It guarantees the compliance with the buffering model indicated by the transmitter of the multiplex and a long-time stability of playback (at least for me). In any case up to a maximum of 64 packets are accumulated to prevent memory hogging and leaks. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26069 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change to always use MP_NOPTS_VALUE (instead of sometimes 0) for unknown pts.reimar2008-02-121-3/+2
| | | | | | | | I did not see anything obvious that would break, it if it does it should be fixed properly once and for all. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25988 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow demuxers to choose a default value for correct_ptsreimar2008-02-031-4/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25951 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use defines to give names to the different seek flags.reimar2008-01-291-2/+2
| | | | | | | | 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 mov subtitles work with -assreimar2008-01-291-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25909 b3059339-0415-0410-9bf9-f77b7e298cf2
* clarify comments/docs about lav* being the preferred place to implement newivo2008-01-281-2/+4
| | | | | | | | codecs and (de)muxers, except for wrappers around external libraries and codecs and (de)muxers requiring binary support. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25908 b3059339-0415-0410-9bf9-f77b7e298cf2
* copy note on new demuxers and codecs to the top of the array as well to beivo2008-01-281-0/+3
| | | | | | | extra clear git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25904 b3059339-0415-0410-9bf9-f77b7e298cf2
* note on new demuxers and codecs, add them to lav* instead of libmp*ivo2008-01-281-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25900 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make all demuxer_desc_t const, thus moving them to .rodatareimar2008-01-131-42/+42
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25735 b3059339-0415-0410-9bf9-f77b7e298cf2
* First step towards making all demuxer_desc_t constreimar2008-01-131-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25734 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove a useless assignment (there is an if just a few lines abovereimar2008-01-131-1/+1
| | | | | | | that ensures those two are already equal). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25733 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a forgotten #ifdef USE_ASS around ass_free_trackreimar2008-01-131-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25730 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add demuxer interface for attachments.eugeni2008-01-121-0/+22
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25685 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove global_ass_track. Instead create an ass_track for each 't' track.eugeni2008-01-111-1/+2
| | | | | | | | Global_ass_track obviously can not work when there is more than one 't tracks, their lines will be mixed up. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25684 b3059339-0415-0410-9bf9-f77b7e298cf2
* Init and destroy ass_tracks in demuxer.c based on sh_sub->type value.eugeni2008-01-111-0/+18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25682 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add extradata to sh_sub_t.eugeni2008-01-111-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25680 b3059339-0415-0410-9bf9-f77b7e298cf2
* Deallocate audio track codecdata.eugeni2008-01-071-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25642 b3059339-0415-0410-9bf9-f77b7e298cf2
* wrapper functions to get/set angle: the wrapping is needed to RESYNC the ↵nicodvb2008-01-051-0/+49
| | | | | | demuxer; patch by oattila chello hu git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25603 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move ds->current=NULL; further up to the free_demux_packet.reimar2007-12-201-1/+1
| | | | | | | | This does not change behaviour in the normal case but avoids a double-free if the function is aborted via a signal handler. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25472 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add demuxer functions for chapter feature.ulion2007-12-131-0/+71
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25386 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix memory leak that tmp allocated but maybe not used.ulion2007-12-101-4/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25342 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make libnemesi use specific struct and DEMUXER_TYPElu_zero2007-12-041-1/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25294 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix typos in comments to stop them hurting my eyesreimar2007-12-011-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25225 b3059339-0415-0410-9bf9-f77b7e298cf2
* demuxer.c: Remove useless codeuau2007-10-251-21/+17
| | | | | | | | Remove "while(1) { }" around two instances of code that always do "return" in the loop body. No functionality changes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24854 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix missing subtitles after seeking backuau2007-10-041-0/+1
| | | | | | | | | | | | | | Subtitle packets that had been demuxed but whose start time had not yet been reached were left in the demuxer stream after seeking. When using the default (non-libass) subtitle rendering this could block subtitles from appearing as long as the playback position stayed below the original one before seek. External subtitle files were not affected. Fixed by making seek code free all packets from the subtitle stream. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24698 b3059339-0415-0410-9bf9-f77b7e298cf2
* libnemesi support, yet another rtsp/rtp library...lu_zero2007-09-191-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24584 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: typo fix UNSUPORTED --> UNSUPPORTEDdiego2007-08-281-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24277 b3059339-0415-0410-9bf9-f77b7e298cf2
* When a new subtitle stream becomes available check if it is the one thatreimar2007-08-091-0/+6
| | | | | | | | | was requested by the user and set up sub->id and sub->sh accordingly. Fixes -slang and -sid with DVD subtitles (basically only 'j' during playback could make them show). This was broken by r23786. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24042 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make sure fformat is set before usereimar2007-07-271-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23885 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some unneeded extern variable declarationsreimar2007-07-271-8/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23884 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 memleak due to not freeing demuxer->s_streamsreimar2007-06-231-0/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23612 b3059339-0415-0410-9bf9-f77b7e298cf2
* More accurate seeking for demuxers lacking DEMUXER_CTRL_GET_TIME_LENGTH controlzuxy2007-06-171-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23572 b3059339-0415-0410-9bf9-f77b7e298cf2
*