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:
885a6d8
)
lavf/img2dec: Skip SOF size when probing jpeg.
author
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Fri, 26 Feb 2016 08:53:29 +0000
(09:53 +0100)
committer
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Fri, 26 Feb 2016 08:53:29 +0000
(09:53 +0100)
Fixes auto-detection for some resolutions.
Reported-by: Clément Bœsch
libavformat/img2dec.c
patch
|
blob
|
history
diff --git
a/libavformat/img2dec.c
b/libavformat/img2dec.c
index
a755b6f
..
28a1fdb
100644
(file)
--- a/
libavformat/img2dec.c
+++ b/
libavformat/img2dec.c
@@
-709,6
+709,7
@@
static int jpeg_probe(AVProbeData *p)
case 0xC5:
case 0xC6:
case 0xC7:
+ i += AV_RB16(&b[i + 2]) + 1;
if (state != 0xD8)
return 0;
state = 0xC0;