Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
fd4af96c
Commit
fd4af96c
authored
Jul 25, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
http: match content-type with forced demux
parent
d9ef65a4
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
2 deletions
+11
-2
modules/access/http.c
modules/access/http.c
+11
-2
No files found.
modules/access/http.c
View file @
fd4af96c
...
@@ -987,9 +987,17 @@ static int Control( access_t *p_access, int i_query, va_list args )
...
@@ -987,9 +987,17 @@ static int Control( access_t *p_access, int i_query, va_list args )
break
;
break
;
case
ACCESS_GET_CONTENT_TYPE
:
case
ACCESS_GET_CONTENT_TYPE
:
*
va_arg
(
args
,
char
**
)
=
{
p_sys
->
psz_mime
?
strdup
(
p_sys
->
psz_mime
)
:
NULL
;
char
**
type
=
va_arg
(
args
,
char
**
);
if
(
p_sys
->
b_icecast
&&
p_sys
->
psz_mime
==
NULL
)
*
type
=
strdup
(
"audio/mpeg"
);
else
if
(
!
strcasecmp
(
p_access
->
psz_access
,
"itpc"
)
)
*
type
=
strdup
(
"application/rss+xml"
);
else
*
type
=
strdup
(
p_sys
->
psz_mime
);
break
;
break
;
}
default:
default:
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
...
@@ -1232,6 +1240,7 @@ static int Request( access_t *p_access, uint64_t i_tell )
...
@@ -1232,6 +1240,7 @@ static int Request( access_t *p_access, uint64_t i_tell )
{
{
p_sys
->
psz_protocol
=
"ICY"
;
p_sys
->
psz_protocol
=
"ICY"
;
p_sys
->
i_code
=
atoi
(
&
psz
[
4
]
);
p_sys
->
i_code
=
atoi
(
&
psz
[
4
]
);
p_sys
->
b_icecast
=
true
;
p_sys
->
b_reconnect
=
true
;
p_sys
->
b_reconnect
=
true
;
}
}
else
else
...
...
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