OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
45fd4ec
)
Do not detect "00000000..." (and other non-changing values) as adp.
author
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Mon, 9 Dec 2013 12:51:00 +0000
(13:51 +0100)
committer
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Mon, 9 Dec 2013 12:51:00 +0000
(13:51 +0100)
libavformat/adp.c
patch
|
blob
|
history
diff --git
a/libavformat/adp.c
b/libavformat/adp.c
index
c5feac4
..
08a4225
100644
(file)
--- a/
libavformat/adp.c
+++ b/
libavformat/adp.c
@@
-26,14
+26,21
@@
static int adp_probe(AVProbeData *p)
{
- int i;
+ int i, changes = 0;
+ char last = 0;
if (p->buf_size < 32)
return 0;
- for (i = 0; i < p->buf_size - 3; i+=32)
+ for (i = 0; i < p->buf_size - 3; i+=32)
{
if (p->buf[i] != p->buf[i+2] || p->buf[i+1] != p->buf[i+3])
return 0;
+ if (p->buf[i] != last)
+ changes++;
+ last = p->buf[i];
+ }
+ if (changes <= 1)
+ return 0;
return p->buf_size < 260 ? 1 : AVPROBE_SCORE_MAX / 4;
}