1
mirror of https://github.com/mpv-player/mpv synced 2024-11-11 00:15:33 +01:00
Commit Graph

49 Commits

Author SHA1 Message Date
reimar
2e369b6908 100l in play_tree_parser_get_line, check that there actually is
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
2007-11-26 20:35:27 +00:00
cehoyos
2fed92a167 Fix possible null-pointer-dereference in parse_smil().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24990 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-08 23:05:54 +00:00
diego
43bd3a468e warning fixes:
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
2007-09-13 13:16:30 +00:00
rtogni
fa20b45747 realrtsp smil files can also use ' as field delimiter instead of "
Fixes rtsp://video.rootvision.net/xxc17.smil


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23794 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-16 20:25:23 +00:00
rtogni
7bb75adb60 Support multiple tags in a single line and tags on the same line as the
<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
2007-03-18 21:39:52 +00:00
rtogni
e2b1eac8a5 Remove code duplication in smil parser
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22538 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-12 22:42:05 +00:00
rtogni
92cbcb7311 Support smil embedded into xml, fixes bugzilla #768
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
2007-03-12 21:45:51 +00:00
rtogni
bb939e6c7b 100l, allocated buffer was too small.
From a patch by Nicholas Kain


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22495 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-08 22:43:35 +00:00
rtogni
ef4a45551b Add support for smil playlist served over realrtsp
(audio and video playback only, not full smil support)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22260 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-18 15:57:50 +00:00
rtogni
714d24670c 10l, fix inverted check for "<media" in smil playlist
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21928 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-14 23:16:27 +00:00
rtogni
7e9859825e Skip empty lines in front of winamp playlist.
Fixes http://www.radioseven.se/radioseven.pls


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20850 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-10 20:35:54 +00:00
ben
49867bd432 introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19277 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-31 17:39:17 +00:00
reimar
e300b2d8c7 relative-to-absolute path fixes: Do not prepend drive letter to \\ paths.
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
2006-07-07 11:17:27 +00:00
reynaldo
11ade8f86d several function from playtreeparser.c maked static,
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
2006-07-06 05:05:00 +00:00
reynaldo
3afd65b3af rm unnecesary casts from void* - part 3
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18884 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-02 08:17:07 +00:00
reynaldo
5b4ec50d44 rm unnecesary void* casts - part 1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18874 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-01 03:56:13 +00:00
albeu
400a9fab2e Doxygen Attack! - Chapter 3
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18266 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-25 01:26:10 +00:00
reynaldo
4bc4473e58 preliminary support for wpl playlists, closes #362
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16872 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-28 22:12:20 +00:00
al
6c46da9932 Don't prepend basepath to a full unix path. ( 10l to Joey. )
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13306 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-10 20:53:22 +00:00
joey
eabfd291c4 windows path seperator fixes
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
2004-08-12 22:33:21 +00:00
alex
1c3d4dc5cd Support for comments in plaintext playlist by adland
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12690 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-26 13:07:04 +00:00
rtognimp
30ccc5dd1e Enhance detection of embedded smil playlist, add embedded ram playlist
support
Patch by adland


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12539 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-06 19:06:39 +00:00
rtognimp
7cfacb3340 Fix embedded smil playlist detection if there are parameters on the url
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12301 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-26 19:33:37 +00:00
rtognimp
e3daf3ca75 Respect -playlist for asx streams
Patch by adland


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12224 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-17 16:46:41 +00:00
rtognimp
0a60a8fd25 Support for smil playlist, both standalone and embedded into other
playlists.
Pathc by adland


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12098 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-01 22:11:28 +00:00
albeu
8a85640354 Fix the bug found by Martin Wulffeld
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10695 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-25 15:29:55 +00:00
diego
1c7f242c96 Typos fixed, based on patch sent by Alex.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10488 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-07-27 22:41:53 +00:00
diego
8838b4afa6 output typo fixes: unknow --> unknown
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10398 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-07-09 01:30:24 +00:00
albeu
ac1ed6d086 Fix the incredible slowness with very long list. Now a 10^6 entries
list take ~1 sec instead of several minutes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9790 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-02 15:32:12 +00:00
albeu
c5c742302c Use new config headers
Remove STREAMTYPE_PLAYLIST.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9750 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-30 17:10:36 +00:00
arpi
3011688180 this patch fixes latest bug, discovered by .so ... (relative filenames &
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
2003-02-06 20:57:25 +00:00
arpi
2484a027b2 100l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9090 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-25 11:34:00 +00:00
arpi
89875edb32 this patch adds an fallback to playlist (any but the plaintext-list format)
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
2003-01-12 19:41:38 +00:00
mosu
a204add899 bunkus: Another nice off-by-one :)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8908 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-12 11:45:49 +00:00
arpi
60fe584e08 This patch adds support for some silly ini-style-playlist-file-format ...
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
2003-01-11 21:01:48 +00:00
albeu
126725660d New config system + cleanup of header inter dependency
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8165 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-12 01:56:42 +00:00
albeu
4e7bb9dd22 10L don't add a base path to the urls
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6664 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-07 04:07:57 +00:00
albeu
4d996f3746 Relative filename in playlist are now relative to the playlist path
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6663 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-07 03:59:58 +00:00
atmos4
f7ea03283e Add support for m3u playlists as generated by eg recent versions of winamp.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6662 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-07 00:00:04 +00:00
albeu
3d152232ab Handle winamp playlist as sublist.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5867 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-27 18:46:38 +00:00
albeu
e87d472777 Portability fix with realloc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5803 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-23 20:06:00 +00:00
albeu
281eecb323 Fix a bug produced when line are terminated with \r\n and not a single
\n


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5789 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-22 18:42:42 +00:00
albeu
c256e5a766 Small bugfix with getting playlist last line.
Thx Atmos


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4858 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-25 11:13:34 +00:00
albeu
a43fe42a2a Playtree parser switch to a by line mode.
Winamp (pls) playlist support.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4783 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-21 13:12:53 +00:00
albeu
37d1cfa8c0 Fixed bug wich interrupt plaintext parsing before real eof
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4715 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-15 10:33:03 +00:00
albeu
416e711c71 Correct bug in plaintext parser : correctly remove trailling \r
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4518 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-03 16:49:41 +00:00
albeu
eed7858a74 Objectization of the play_tree_parser for more flexiblity
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4309 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-22 22:46:12 +00:00
arpi
ef4a38a54e playtree-based config patch by Alban Bedel <albeu@free.fr>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4157 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-14 23:38:49 +00:00
arpi
10d82182e0 tree-based playlist parser code by Alban Bedel <albeu@free.fr>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4044 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-08 01:24:25 +00:00