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:
9b5a4a9
)
jpeg2000: Do not warn about known and skippable markers
author
Luca Barbato
<lu_zero@gentoo.org>
Fri, 11 Sep 2015 01:00:36 +0000
(
03:00
+0200)
committer
Luca Barbato
<lu_zero@gentoo.org>
Fri, 11 Sep 2015 16:19:01 +0000
(18:19 +0200)
Matches the openjpeg behaviour.
libavcodec/jpeg2000dec.c
patch
|
blob
|
history
diff --git
a/libavcodec/jpeg2000dec.c
b/libavcodec/jpeg2000dec.c
index
6946975
..
f5d5daf
100644
(file)
--- a/
libavcodec/jpeg2000dec.c
+++ b/
libavcodec/jpeg2000dec.c
@@
-1290,6
+1290,10
@@
static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s)
properties = s->tile[s->curtileno].properties;
}
break;
+ case JPEG2000_PLT:
+ // the PLT marker is ignored
+ case JPEG2000_PLM:
+ // the PLM marker is ignored
case JPEG2000_COM:
// the comment is ignored
bytestream2_skip(&s->g, len - 2);