diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-16 23:07:28 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-16 23:24:51 +0200 |
commit | 427bcdf035f5decca182651acfe067d685b3feb5 (patch) | |
tree | 2bd58d2bf36a2aac7ab5ff455f78a455f18dcc82 /libavformat/mpegts.c | |
parent | b7d5e016a3f3b2c60f8dc6725ab9628ef58a7644 (diff) |
avformat/mpegts: Use differential score for analyze()
This avoids high scores in random data that has a high 0x47 frequency
Fixes Ticket3844
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegts.c')
-rw-r--r-- | libavformat/mpegts.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 550af6f6d6..a1186895df 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -506,6 +506,7 @@ static int analyze(const uint8_t *buf, int size, int packet_size, int *index) int stat[TS_MAX_PACKET_SIZE]; int i; int best_score = 0; + int best_score2 = 0; memset(stat, 0, packet_size * sizeof(*stat)); @@ -517,11 +518,13 @@ static int analyze(const uint8_t *buf, int size, int packet_size, int *index) best_score = stat[x]; if (index) *index = x; + } else if (stat[x] > best_score2) { + best_score2 = stat[x]; } } } - return best_score; + return best_score - best_score2; } /* autodetect fec presence. Must have at least 1024 bytes */ |