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
389380c2
Commit
389380c2
authored
Jul 17, 2014
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
http: Do move the class instantiation in the conditional block
Remove a warning if https support is disabled.
parent
28df1d24
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
10 deletions
+12
-10
http.c
libavformat/http.c
+12
-10
No files found.
libavformat/http.c
View file @
389380c2
...
@@ -114,16 +114,6 @@ static const AVOption options[] = {
...
@@ -114,16 +114,6 @@ static const AVOption options[] = {
{
"method"
,
"Override the HTTP method"
,
OFFSET
(
method
),
AV_OPT_TYPE_STRING
,
{
.
str
=
NULL
},
0
,
0
,
E
,
},
{
"method"
,
"Override the HTTP method"
,
OFFSET
(
method
),
AV_OPT_TYPE_STRING
,
{
.
str
=
NULL
},
0
,
0
,
E
,
},
{
NULL
}
{
NULL
}
};
};
#define HTTP_CLASS(flavor)\
static const AVClass flavor ## _context_class = {\
.class_name = #flavor,\
.item_name = av_default_item_name,\
.option = options,\
.version = LIBAVUTIL_VERSION_INT,\
}
HTTP_CLASS
(
http
);
HTTP_CLASS
(
https
);
static
int
http_connect
(
URLContext
*
h
,
const
char
*
path
,
const
char
*
local_path
,
static
int
http_connect
(
URLContext
*
h
,
const
char
*
path
,
const
char
*
local_path
,
const
char
*
hoststr
,
const
char
*
auth
,
const
char
*
hoststr
,
const
char
*
auth
,
...
@@ -956,7 +946,17 @@ http_get_file_handle(URLContext *h)
...
@@ -956,7 +946,17 @@ http_get_file_handle(URLContext *h)
return
ffurl_get_file_handle
(
s
->
hd
);
return
ffurl_get_file_handle
(
s
->
hd
);
}
}
#define HTTP_CLASS(flavor)\
static const AVClass flavor ## _context_class = {\
.class_name = #flavor,\
.item_name = av_default_item_name,\
.option = options,\
.version = LIBAVUTIL_VERSION_INT,\
}
#if CONFIG_HTTP_PROTOCOL
#if CONFIG_HTTP_PROTOCOL
HTTP_CLASS
(
http
);
URLProtocol
ff_http_protocol
=
{
URLProtocol
ff_http_protocol
=
{
.
name
=
"http"
,
.
name
=
"http"
,
.
url_open2
=
http_open
,
.
url_open2
=
http_open
,
...
@@ -972,6 +972,8 @@ URLProtocol ff_http_protocol = {
...
@@ -972,6 +972,8 @@ URLProtocol ff_http_protocol = {
};
};
#endif
#endif
#if CONFIG_HTTPS_PROTOCOL
#if CONFIG_HTTPS_PROTOCOL
HTTP_CLASS
(
https
);
URLProtocol
ff_https_protocol
=
{
URLProtocol
ff_https_protocol
=
{
.
name
=
"https"
,
.
name
=
"https"
,
.
url_open2
=
http_open
,
.
url_open2
=
http_open
,
...
...
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