virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/mpegts: Fix probing of mpegts with invalid ASC

Browse Source 
Fixes Ticket5566

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2016-06-07 15:46:08 +02:00
parent a2e6c785ce
commit e01b19dece
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/mpegts.c
View File

@@ -542,8 +542,10 @@ static int analyze(const uint8_t *buf, int size, int packet_size,
memset(stat, 0, packet_size * sizeof(*stat)); memset(stat, 0, packet_size * sizeof(*stat));
for (i = 0; i < size - 3; i++) { for (i = 0; i < size - 3; i++) {
if (buf[i] == 0x47 && if (buf[i] == 0x47) {
(!probe || (buf[i + 3] & 0x30))) { int pid = AV_RB16(buf+1) & 0x1FFF;
int asc = buf[i + 3] & 0x30;
if (!probe || pid == 0x1FFF || asc) {
int x = i % packet_size; int x = i % packet_size;
stat[x]++; stat[x]++;
stat_all++; stat_all++;
@@ -552,6 +554,7 @@ static int analyze(const uint8_t *buf, int size, int packet_size,
} }
} }
} }
}
return best_score - FFMAX(stat_all - 10*best_score, 0)/10; return best_score - FFMAX(stat_all - 10*best_score, 0)/10;
} }