Skip to content
Snippets Groups Projects
Commit 401d61d3 authored by François Cartegnie's avatar François Cartegnie :fingers_crossed:
Browse files

demux: adaptive: skip PNG junk when probing

refs #28757
parent a4aea586
No related branches found
No related tags found
1 merge request!5934demux: adaptive: skip PNG junk when probing
Pipeline #508275 passed with stage
in 18 minutes and 26 seconds
......@@ -128,6 +128,24 @@ StreamFormat::StreamFormat(const void *data_, size_t sz)
type = Type::Unknown;
const char moov[] = "ftypmoovmoofemsg";
/* Skip PNG junk */
if(sz >= 20 && !memcmp(data, "\x89PNG\x0D\x0A\x1A\x0A", 8))
{
data += 8;
sz -= 8;
while(sz >= 12)
{
uint32_t chunk = GetDWBE(data);
vlc_fourcc_t cktype = VLC_FOURCC(data[4], data[5], data[6], data[7]);
if(chunk > sz - 12)
break;
sz -= chunk + 12;
data += chunk + 12;
if(cktype == VLC_FOURCC('I','E','N','D'))
break;
}
}
/* Skipped ID3 if any */
while(sz > 10 && ID3TAG_IsTag(data, false))
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment