summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorwm4 <wm4@mplayer2.org>2012-07-28 23:47:42 +0200
committerwm4 <wm4@mplayer2.org>2012-07-28 23:47:42 +0200
commit08caadb9c0b3c9070f2e5cb7f883f43d6cd5590e (patch)
treee6a6c3a2042231651ec2f622e312657da900280b /stream
parentca0979a5db442ae212c92a34dcbd97101eb5e51c (diff)
downloadmpv-08caadb9c0b3c9070f2e5cb7f883f43d6cd5590e.tar.bz2
mpv-08caadb9c0b3c9070f2e5cb7f883f43d6cd5590e.tar.xz
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.
Diffstat (limited to 'stream')
-rw-r--r--stream/stream.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/stream/stream.c b/stream/stream.c
index 772c87dd9c..cb3679fbef 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -164,7 +164,7 @@ static stream_t *open_stream_plugin(const stream_info_t *sinfo,
if(sinfo->opts_url) {
m_option_t url_opt =
{ "stream url", arg , CONF_TYPE_CUSTOM_URL, 0, 0 ,0, (void *)sinfo->opts };
- if (m_option_parse(&url_opt, bstr("stream url"), bstr(filename), false, arg) < 0) {
+ if (m_option_parse(&url_opt, bstr0("stream url"), bstr0(filename), false, arg) < 0) {
mp_tmsg(MSGT_OPEN,MSGL_ERR, "URL parsing failed on url %s\n",filename);
m_struct_free(desc,arg);
return NULL;