summaryrefslogtreecommitdiffstats
path: root/playtreeparser.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r30798Uoti Urpala2010-03-101-4/+19
|\
| * Use negative return values for errors in pls_read_entry to make it matchreimar2010-02-281-3/+3
| | | | | | | | | | | | | | with the checks later on. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30793 b3059339-0415-0410-9bf9-f77b7e298cf2
| * A playlist entry number of 0 is invalid for pls playlists.reimar2010-02-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30792 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Improve integer overflow and realloc error handling in playlist parser.reimar2010-02-281-3/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30791 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30748Uoti Urpala2010-03-101-5/+5
|\|
| * Do not cast the results of malloc/calloc/realloc.diego2010-02-261-5/+5
| | | | | | | | | | | | | | | | These functions return void*, which is compatible with any pointer, so there is no need for casts. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30744 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30675Uoti Urpala2010-03-101-3/+1
|\|
| * Add asx_parser_build_tree() to asxparser.h instead of forward declaring it.diego2010-02-201-3/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30674 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30475Uoti Urpala2010-03-091-0/+17
|\|
| * Add license header to all top-level files missing them.diego2010-01-301-0/+17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30471 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-22/+22
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-22/+22
| |
* | Merge svn changes up to r28366Uoti Urpala2009-01-261-0/+2
|\| | | | | | | | | | | | | | | | | Contains more changes needed to sync build system with latest FFmpeg. Conflicts: Makefile configure mplayer.c
| * add "<!DOCTYPE smil" to smil playlistcompn2009-01-241-0/+2
| | | | | | | | | | | | | | patch by Gavin McCullagh gmccullagh!gmail!com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28349 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28310Uoti Urpala2009-01-151-3/+7
|\| | | | | | | | | | | | | | | The libdvdread4 and libdvdnav directories, which are externals in the svn repository, are at least for now not included in any form. I added configure checks to automatically disable internal libdvdread and libdvdnav if the corresponding directories are not present; if they're added manually then things work the same as in svn.
| * 1000l, play_tree_parser_stop_keeping broke 0-termination of bufferreimar2009-01-011-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28219 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add zero termination missing in two cases.reimar2009-01-011-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28218 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add asserts to detect when assumptions for play_tree_parser_get_linereimar2009-01-011-2/+4
| | | | | | | | | | | | | | fail (mostly due to parsers using it incorrectly). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28217 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Move global mconfig to mpctxUoti Urpala2008-04-261-11/+12
|/ | | | | | | | | | | The global was used in the function cfg_include which handles the -include option. Make the address available in that function by creating a new dynamically allocated option in m_config_new that has the address in the option's private data. asxparser.c also used the global. Making it available through all ways the code could get called required a number of relatively straightforward changes to playtree and menu code.
* 100l in play_tree_parser_get_line, check that there actually isreimar2007-11-261-1/+1
| | | | | | | | a previous character before comparing it against '\r'. Fixes a possible crash on playlist file that is empty or starts with an empty line. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25169 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix possible null-pointer-dereference in parse_smil().cehoyos2007-11-081-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24990 b3059339-0415-0410-9bf9-f77b7e298cf2
* warning fixes:diego2007-09-131-1/+1
| | | | | | | | | | | | | | | | | input.c: In function 'mp_input_set_section': input.c:1640: warning: suggest parentheses around assignment used as truth value input.c:1643: warning: suggest parentheses around assignment used as truth value mga_common.c: In function 'mga_init': mga_common.c:394: warning: suggest parentheses around assignment used as truth value playtreeparser.c: In function 'parse_smil': playtreeparser.c:523: warning: suggest parentheses around assignment used as truth value libmpdemux/demux_ts.c: In function 'ts_parse': libmpdemux/demux_ts.c:2795: warning: suggest parentheses around assignment used as truth value libmpdemux/demux_ts.c: In function 'demux_open_ts': libmpdemux/demux_ts.c:591: warning: 'frame_length' may be used uninitialized in this function git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24444 b3059339-0415-0410-9bf9-f77b7e298cf2
* realrtsp smil files can also use ' as field delimiter instead of "rtogni2007-07-161-1/+5
| | | | | | | Fixes rtsp://video.rootvision.net/xxc17.smil git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23794 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support multiple tags in a single line and tags on the same line as the rtogni2007-03-181-8/+15
| | | | | | | | <smil> signature. Fixes http://www.cartalk.com/Radio/Show/01.smil git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22730 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove code duplication in smil parserrtogni2007-03-121-24/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22538 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support smil embedded into xml, fixes bugzilla #768rtogni2007-03-121-0/+2
| | | | | | | Patch by Pavel Fedin | sonic_amiga |a| rambler : ru | (on bugzilla) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22536 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l, allocated buffer was too small.rtogni2007-03-081-1/+1
| | | | | | | From a patch by Nicholas Kain git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22495 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add support for smil playlist served over realrtsprtogni2007-02-181-4/+65
| | | | | | | (audio and video playback only, not full smil support) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22260 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l, fix inverted check for "<media" in smil playlistrtogni2007-01-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21928 b3059339-0415-0410-9bf9-f77b7e298cf2
* Skip empty lines in front of winamp playlist.rtogni2006-11-101-2/+6
| | | | | | | Fixes http://www.radioseven.se/radioseven.pls git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20850 b3059339-0415-0410-9bf9-f77b7e298cf2
* introduce new 'stream' directory for all stream layer related components and ↵ben2006-07-311-1/+1
| | | | | | split them from libmpdemux git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19277 b3059339-0415-0410-9bf9-f77b7e298cf2
* relative-to-absolute path fixes: Do not prepend drive letter to \\ paths.reimar2006-07-071-1/+3
| | | | | | | Do not exit after prepending drive letter to first file, process other files as well. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18933 b3059339-0415-0410-9bf9-f77b7e298cf2
* several function from playtreeparser.c maked static,reynaldo2006-07-061-7/+7
| | | | | | | | | as these are not used outside. Patch by Stefan Huehner stefan AT huehner-org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18921 b3059339-0415-0410-9bf9-f77b7e298cf2
* rm unnecesary casts from void* - part 3reynaldo2006-07-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18884 b3059339-0415-0410-9bf9-f77b7e298cf2
* rm unnecesary void* casts - part 1reynaldo2006-07-011-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18874 b3059339-0415-0410-9bf9-f77b7e298cf2
* Doxygen Attack! - Chapter 3albeu2006-04-251-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18266 b3059339-0415-0410-9bf9-f77b7e298cf2
* preliminary support for wpl playlists, closes #362reynaldo2005-10-281-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16872 b3059339-0415-0410-9bf9-f77b7e298cf2
* Don't prepend basepath to a full unix path. ( 10l to Joey. )al2004-09-101-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13306 b3059339-0415-0410-9bf9-f77b7e298cf2
* windows path seperator fixesjoey2004-08-121-8/+11
| | | | | | | | | | | | mp_basename now looks for \ and / both new playlist parsing: /path/to/thing is treated as a full path c:\windows is treated as a full path \windows is "near-full" and we prepend drive letter file.avi is relative and we prepend path to playlist git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13011 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support for comments in plaintext playlist by adlandalex2004-06-261-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12690 b3059339-0415-0410-9bf9-f77b7e298cf2
* Enhance detection of embedded smil playlist, add embedded ram playlistrtognimp2004-06-061-3/+8
| | | | | | | | support Patch by adland git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12539 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix embedded smil playlist detection if there are parameters on the urlrtognimp2004-04-261-6/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12301 b3059339-0415-0410-9bf9-f77b7e298cf2
* Respect -playlist for asx streamsrtognimp2004-04-171-2/+3
| | | | | | | Patch by adland git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12224 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support for smil playlist, both standalone and embedded into otherrtognimp2004-04-011-7/+136
| | | | | | | | playlists. Pathc by adland git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12098 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix the bug found by Martin Wulffeldalbeu2003-08-251-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10695 b3059339-0415-0410-9bf9-f77b7e298cf2
* Typos fixed, based on patch sent by Alex.diego2003-07-271-8/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10488 b3059339-0415-0410-9bf9-f77b7e298cf2
* output typo fixes: unknow --> unknowndiego2003-07-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10398 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix the incredible slowness with very long list. Now a 10^6 entriesalbeu2003-04-021-8/+12
| | | | | | | list take ~1 sec instead of several minutes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9790 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use new config headersalbeu2003-03-301-11/+4
| | | | | | | Remove STREAMTYPE_PLAYLIST. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9750 b3059339-0415-0410-9bf9-f77b7e298cf2
* this patch fixes latest bug, discovered by .so ... (relative filenames &arpi2003-02-061-7/+21
| | | | | | | | playlists) This affects also the gui (filenames with space) patch by Fabian Franz <FabianFranz@gmx.de> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9302 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100larpi2003-01-251-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9090 b3059339-0415-0410-9bf9-f77b7e298cf2
* this patch adds an fallback to playlist (any but the plaintext-list format)arpi2003-01-121-11/+18
| | | | | | | | after all demuxers failed. so -playlist is not needed any more! patch by Fabian Franz <FabianFranz@gmx.de>, with some small modifications git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8926 b3059339-0415-0410-9bf9-f77b7e298cf2
* bunkus: Another nice off-by-one :)mosu2003-01-121-2/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8908 b3059339-0415-0410-9bf9-f77b7e298cf2
* This patch adds support for some silly ini-style-playlist-file-format ...arpi2003-01-111-0/+48
| | | | | | | | | | It starts with [Reference] and entries are: Ref<n>=<url> patch by Fabian Franz <FabianFranz@gmx.de> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8898 b3059339-0415-0410-9bf9-f77b7e298cf2
* New config system + cleanup of header inter dependencyalbeu2002-11-121-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8165 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10L don't add a base path to the urlsalbeu2002-07-071-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6664 b3059339-0415-0410-9bf9-f77b7e298cf2
* Relative filename in playlist are now relative to the playlist pathalbeu2002-07-071-0/+39
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6663 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add support for m3u playlists as generated by eg recent versions of winamp.atmos42002-07-071-1/+51
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6662 b3059339-0415-0410-9bf9-f77b7e298cf2
* Handle winamp playlist as sublist.albeu2002-04-271-2/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5867 b3059339-0415-0410-9bf9-f77b7e298cf2
* Portability fix with reallocalbeu2002-04-231-5/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5803 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix a bug produced when line are terminated with \r\n and not a singlealbeu2002-04-221-1/+1
| | | | | | | \n git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5789 b3059339-0415-0410-9bf9-f77b7e298cf2
* Small bugfix with getting playlist last line.albeu2002-02-251-5/+5
| | | | | | | Thx Atmos git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4858 b3059339-0415-0410-9bf9-f77b7e298cf2
* Playtree parser switch to a by line mode.albeu2002-02-211-181/+297
| | | | | | | Winamp (pls) playlist support. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4783 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fixed bug wich interrupt plaintext parsing before real eofalbeu2002-02-151-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4715 b3059339-0415-0410-9bf9-f77b7e298cf2
* Correct bug in plaintext parser : correctly remove trailling \ralbeu2002-02-031-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4518 b3059339-0415-0410-9bf9-f77b7e298cf2
* Objectization of the play_tree_parser for more flexiblityalbeu2002-01-221-102/+142
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4309 b3059339-0415-0410-9bf9-f77b7e298cf2
* playtree-based config patch by Alban Bedel <albeu@free.fr>arpi2002-01-141-1/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4157 b3059339-0415-0410-9bf9-f77b7e298cf2
* tree-based playlist parser code by Alban Bedel <albeu@free.fr>arpi2002-01-081-0/+298
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4044 b3059339-0415-0410-9bf9-f77b7e298cf2
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 20:24:24 +0000