Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
f984dcf6
Commit
f984dcf6
authored
Mar 08, 2010
by
Martin Storsjö
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reindent
Originally committed as revision 22322 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
c5c6e67c
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
18 additions
and
18 deletions
+18
-18
avformat.h
libavformat/avformat.h
+5
-5
gopher.c
libavformat/gopher.c
+1
-1
http.c
libavformat/http.c
+2
-2
rtmpproto.c
libavformat/rtmpproto.c
+1
-1
rtpproto.c
libavformat/rtpproto.c
+2
-2
rtsp.c
libavformat/rtsp.c
+2
-2
utils.c
libavformat/utils.c
+5
-5
No files found.
libavformat/avformat.h
View file @
f984dcf6
...
...
@@ -1344,11 +1344,11 @@ struct in_addr;
attribute_deprecated
int
resolve_host
(
struct
in_addr
*
sin_addr
,
const
char
*
hostname
);
void
ff_url_split
(
char
*
proto
,
int
proto_size
,
char
*
authorization
,
int
authorization_size
,
char
*
hostname
,
int
hostname_size
,
int
*
port_ptr
,
char
*
path
,
int
path_size
,
const
char
*
url
);
char
*
authorization
,
int
authorization_size
,
char
*
hostname
,
int
hostname_size
,
int
*
port_ptr
,
char
*
path
,
int
path_size
,
const
char
*
url
);
/**
* Assembles a URL string from components. This is the reverse operation
...
...
libavformat/gopher.c
View file @
f984dcf6
...
...
@@ -90,7 +90,7 @@ static int gopher_open(URLContext *h, const char *uri, int flags)
/* needed in any case to build the host string */
ff_url_split
(
NULL
,
0
,
auth
,
sizeof
(
auth
),
hostname
,
sizeof
(
hostname
),
&
port
,
path
,
sizeof
(
path
),
uri
);
path
,
sizeof
(
path
),
uri
);
if
(
port
<
0
)
port
=
70
;
...
...
libavformat/http.c
View file @
f984dcf6
...
...
@@ -70,12 +70,12 @@ static int http_open_cnx(URLContext *h)
redo:
/* needed in any case to build the host string */
ff_url_split
(
NULL
,
0
,
auth
,
sizeof
(
auth
),
hostname
,
sizeof
(
hostname
),
&
port
,
path1
,
sizeof
(
path1
),
s
->
location
);
path1
,
sizeof
(
path1
),
s
->
location
);
ff_url_join
(
hoststr
,
sizeof
(
hoststr
),
NULL
,
NULL
,
hostname
,
port
,
NULL
);
if
(
use_proxy
)
{
ff_url_split
(
NULL
,
0
,
auth
,
sizeof
(
auth
),
hostname
,
sizeof
(
hostname
),
&
port
,
NULL
,
0
,
proxy_path
);
NULL
,
0
,
proxy_path
);
path
=
s
->
location
;
}
else
{
if
(
path1
[
0
]
==
'\0'
)
...
...
libavformat/rtmpproto.c
View file @
f984dcf6
...
...
@@ -813,7 +813,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
rt
->
is_input
=
!
(
flags
&
URL_WRONLY
);
ff_url_split
(
proto
,
sizeof
(
proto
),
NULL
,
0
,
hostname
,
sizeof
(
hostname
),
&
port
,
path
,
sizeof
(
path
),
s
->
filename
);
path
,
sizeof
(
path
),
s
->
filename
);
if
(
port
<
0
)
port
=
RTMP_DEFAULT_PORT
;
...
...
libavformat/rtpproto.c
View file @
f984dcf6
...
...
@@ -65,7 +65,7 @@ int rtp_set_remote_url(URLContext *h, const char *uri)
char
path
[
1024
];
ff_url_split
(
NULL
,
0
,
NULL
,
0
,
hostname
,
sizeof
(
hostname
),
&
port
,
path
,
sizeof
(
path
),
uri
);
path
,
sizeof
(
path
),
uri
);
ff_url_join
(
buf
,
sizeof
(
buf
),
"udp"
,
NULL
,
hostname
,
port
,
"%s"
,
path
);
udp_set_remote_url
(
s
->
rtp_hd
,
buf
);
...
...
@@ -135,7 +135,7 @@ static int rtp_open(URLContext *h, const char *uri, int flags)
h
->
priv_data
=
s
;
ff_url_split
(
NULL
,
0
,
NULL
,
0
,
hostname
,
sizeof
(
hostname
),
&
port
,
path
,
sizeof
(
path
),
uri
);
path
,
sizeof
(
path
),
uri
);
/* extract parameters */
ttl
=
-
1
;
local_port
=
-
1
;
...
...
libavformat/rtsp.c
View file @
f984dcf6
...
...
@@ -447,7 +447,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1,
/* XXX: may need to add full url resolution */
ff_url_split
(
proto
,
sizeof
(
proto
),
NULL
,
0
,
NULL
,
0
,
NULL
,
NULL
,
0
,
p
);
NULL
,
NULL
,
0
,
p
);
if
(
proto
[
0
]
==
'\0'
)
{
/* relative control URL */
if
(
rtsp_st
->
control_url
[
strlen
(
rtsp_st
->
control_url
)
-
1
]
!=
'/'
)
...
...
@@ -1391,7 +1391,7 @@ int ff_rtsp_connect(AVFormatContext *s)
redirect:
/* extract hostname and port */
ff_url_split
(
NULL
,
0
,
auth
,
sizeof
(
auth
),
host
,
sizeof
(
host
),
&
port
,
path
,
sizeof
(
path
),
s
->
filename
);
host
,
sizeof
(
host
),
&
port
,
path
,
sizeof
(
path
),
s
->
filename
);
if
(
*
auth
)
{
int
auth_len
=
strlen
(
auth
),
b64_len
=
((
auth_len
+
2
)
/
3
)
*
4
+
1
;
...
...
libavformat/utils.c
View file @
f984dcf6
...
...
@@ -3366,11 +3366,11 @@ void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt, int dump_payload)
}
void
ff_url_split
(
char
*
proto
,
int
proto_size
,
char
*
authorization
,
int
authorization_size
,
char
*
hostname
,
int
hostname_size
,
int
*
port_ptr
,
char
*
path
,
int
path_size
,
const
char
*
url
)
char
*
authorization
,
int
authorization_size
,
char
*
hostname
,
int
hostname_size
,
int
*
port_ptr
,
char
*
path
,
int
path_size
,
const
char
*
url
)
{
const
char
*
p
,
*
ls
,
*
at
,
*
col
,
*
brk
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment