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
a8809231
Commit
a8809231
authored
Sep 17, 2016
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/http: Fix #ifdef FF_API_HTTP_USER_AGENT
Signed-off-by:
Michael Niedermayer
<
michael@niedermayer.cc
>
parent
22bdba7a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
http.c
libavformat/http.c
+3
-3
No files found.
libavformat/http.c
View file @
a8809231
...
...
@@ -71,7 +71,7 @@ typedef struct HTTPContext {
char
*
headers
;
char
*
mime_type
;
char
*
user_agent
;
#if
def
FF_API_HTTP_USER_AGENT
#if FF_API_HTTP_USER_AGENT
char
*
user_agent_deprecated
;
#endif
char
*
content_type
;
...
...
@@ -134,7 +134,7 @@ static const AVOption options[] = {
{
"headers"
,
"set custom HTTP headers, can override built in default headers"
,
OFFSET
(
headers
),
AV_OPT_TYPE_STRING
,
{
.
str
=
NULL
},
0
,
0
,
D
|
E
},
{
"content_type"
,
"set a specific content type for the POST messages"
,
OFFSET
(
content_type
),
AV_OPT_TYPE_STRING
,
{
.
str
=
NULL
},
0
,
0
,
D
|
E
},
{
"user_agent"
,
"override User-Agent header"
,
OFFSET
(
user_agent
),
AV_OPT_TYPE_STRING
,
{
.
str
=
DEFAULT_USER_AGENT
},
0
,
0
,
D
},
#if
def
FF_API_HTTP_USER_AGENT
#if FF_API_HTTP_USER_AGENT
{
"user-agent"
,
"override User-Agent header"
,
OFFSET
(
user_agent_deprecated
),
AV_OPT_TYPE_STRING
,
{
.
str
=
DEFAULT_USER_AGENT
},
0
,
0
,
D
},
#endif
{
"multiple_requests"
,
"use persistent connections"
,
OFFSET
(
multiple_requests
),
AV_OPT_TYPE_BOOL
,
{
.
i64
=
0
},
0
,
1
,
D
|
E
},
...
...
@@ -1042,7 +1042,7 @@ static int http_connect(URLContext *h, const char *path, const char *local_path,
send_expect_100
=
1
;
}
#if
def
FF_API_HTTP_USER_AGENT
#if FF_API_HTTP_USER_AGENT
if
(
strcmp
(
s
->
user_agent_deprecated
,
DEFAULT_USER_AGENT
))
{
av_log
(
s
,
AV_LOG_WARNING
,
"the user-agent option is deprecated, please use user_agent option
\n
"
);
s
->
user_agent
=
av_strdup
(
s
->
user_agent_deprecated
);
...
...
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