Commit Graph

75 Commits

Author SHA1 Message Date
wm4 08caadb9c0 bstr: rename bstr() function to bstr0(), and typedef bstr to struct bstr
Replace all uses of bstr() with bstr0().
Also remove the ridiculous C++ workaround.
2012-07-28 23:47:42 +02:00
Uoti Urpala b33bb28ea3 build: fix --enable-debug, remove some "#ifdef MP_DEBUG"
Recent commit 5d5ca22a6d ("options: commandline: accept --foo=xyz
style options") left some bad code under "#ifdef MP_DEBUG" in
playtree.c, which caused a compilation failure if configured with
"--enable-debug". Fix this. Having the "#ifdef MP_DEBUG" there was
completely unnecessary; it only increased the risk for this kind of
problems for no real benefit - executing the asserts under it would
have no noticeable performance or other penalty in default builds
either. Remove several cases of such harmful "#ifdef MP_DEBUG".
2011-07-30 19:03:20 +03:00
Uoti Urpala 5d5ca22a6d options: commandline: accept --foo=xyz style options
Allow writing commandline options with two leading dashes. In this
mode a parameter for the option, if any, follows after a '=';
following separate commandline arguments are never consumed as a
parameter to a previous double-dash option.

Flag options may omit parameter and behave like old single-dash
syntax. "--fs=yes", "--fs=no" and "--fs" are all valid; the first two
behave like configuration file "fs=yes" and "fs=no", and last is the
same as old "-fs" (same effect as "--fs=yes").
2011-07-29 07:24:09 +03:00
reimar dbff0e49ba playlist: Support "Length" option in .pls playlist files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33620 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-07-06 13:01:07 +03:00
reimar 937b086606 playtreeparser.c: Add playlist parser for .nsc files
Tested to properly decode .nsc files, but not properly tested since
no publically available stream could be found.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32710 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove pointless NULL checks before free.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32715 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-12-16 06:22:53 +02:00
diego 12d3e0df99 cleanup: don't check for NULL before free()
patch by Clément Bœsch, ubitux gmail com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32598 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-08 18:05:12 +02:00
siretart 55a7d7fb2b playtree: don't try to parse playlists without recognized entries
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31961 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:48 +02:00
Uoti Urpala bc1d0ca37d Merge svn changes up to r30798 2010-03-10 02:35:02 +02:00
Uoti Urpala e74708f619 Merge svn changes up to r30748 2010-03-10 01:50:55 +02:00
Uoti Urpala 90f5873f1a Merge svn changes up to r30675 2010-03-10 00:47:25 +02:00
Uoti Urpala 12d3caebc7 Merge svn changes up to r30475 2010-03-09 19:18:43 +02:00
reimar 62cc3b452b Use negative return values for errors in pls_read_entry to make it match
with the checks later on.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30793 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-28 09:41:07 +00:00
reimar 7e23f68cf7 A playlist entry number of 0 is invalid for pls playlists.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30792 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-28 09:39:30 +00:00
reimar 4a432dc1ee Improve integer overflow and realloc error handling in playlist parser.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30791 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-28 09:37:35 +00:00
diego b63759b175 Do not cast the results of malloc/calloc/realloc.
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
2010-02-26 15:01:37 +00:00
diego 4a2e468d4b Add asx_parser_build_tree() to asxparser.h instead of forward declaring it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30674 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-20 20:09:06 +00:00
diego 99c1bbca2a Add license header to all top-level files missing them.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30471 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-30 23:24:23 +00:00
Uoti Urpala 0eb321bf2c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
diego 6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
Uoti Urpala dd888b05ff Merge svn changes up to r28366
Contains more changes needed to sync build system with latest FFmpeg.

Conflicts:
	Makefile
	configure
	mplayer.c
2009-01-26 00:58:15 +02:00
compn 79d4434b88 add "<!DOCTYPE smil" to smil playlist
patch by Gavin McCullagh gmccullagh!gmail!com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28349 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-24 22:14:32 +00:00
Uoti Urpala 9bcd12fdf5 Merge svn changes up to r28310
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.
2009-01-15 05:57:31 +02:00
reimar 756e662b68 1000l, play_tree_parser_stop_keeping broke 0-termination of buffer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28219 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-01 09:47:21 +00:00
reimar 67ff2e11b8 Add zero termination missing in two cases.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28218 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-01 09:37:02 +00:00
reimar 27fcc9c6a6 Add asserts to detect when assumptions for play_tree_parser_get_line
fail (mostly due to parsers using it incorrectly).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28217 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-01 09:35:25 +00:00
Uoti Urpala fb33e286b5 Move global mconfig to mpctx
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.
2008-04-26 10:44:59 +03:00
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