Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
036bde53
Commit
036bde53
authored
Jun 07, 2020
by
François Cartegnie
🤞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: adaptive: make Content-Type no longer authoritative
tired of bogus HLS configs ref #24817
parent
b3fe59fa
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
9 deletions
+11
-9
modules/demux/adaptive/plumbing/Demuxer.cpp
modules/demux/adaptive/plumbing/Demuxer.cpp
+11
-9
No files found.
modules/demux/adaptive/plumbing/Demuxer.cpp
View file @
036bde53
...
...
@@ -114,18 +114,20 @@ bool MimeDemuxer::create()
return
false
;
StreamFormat
format
(
StreamFormat
::
UNKNOWN
);
char
*
type
=
stream_ContentType
(
p_newstream
);
if
(
type
)
{
format
=
StreamFormat
(
std
::
string
(
type
));
free
(
type
);
}
/* Try to probe */
const
uint8_t
*
p_peek
;
size_t
i_peek
=
sourcestream
->
Peek
(
&
p_peek
,
StreamFormat
::
PEEK_SIZE
);
format
=
StreamFormat
(
reinterpret_cast
<
const
void
*>
(
p_peek
),
i_peek
);
if
(
format
==
StreamFormat
(
StreamFormat
::
UNKNOWN
))
{
const
uint8_t
*
p_peek
;
size_t
i_peek
=
sourcestream
->
Peek
(
&
p_peek
,
StreamFormat
::
PEEK_SIZE
);
format
=
StreamFormat
(
reinterpret_cast
<
const
void
*>
(
p_peek
),
i_peek
);
char
*
type
=
stream_ContentType
(
p_newstream
);
if
(
type
)
{
format
=
StreamFormat
(
std
::
string
(
type
));
free
(
type
);
}
}
if
(
format
!=
StreamFormat
(
StreamFormat
::
UNKNOWN
))
...
...
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