summaryrefslogtreecommitdiff
path: root/libavcodec/jpeg2000dec.c
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2015-09-11 03:00:36 +0200
committerLuca Barbato <lu_zero@gentoo.org>2015-09-11 18:19:01 +0200
commitdb53a2306f62f05faa67e6f3c60ee55a9b8e4776 (patch)
tree54d9ae60969455059619d892be7a39d306c4e2d6 /libavcodec/jpeg2000dec.c
parent9b5a4a9cce3042558e107ae1ed30d9bf3d867a35 (diff)
jpeg2000: Do not warn about known and skippable markers
Matches the openjpeg behaviour.
Diffstat (limited to 'libavcodec/jpeg2000dec.c')
-rw-r--r--libavcodec/jpeg2000dec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 6946975fb8..f5d5dafff4 100644
--- 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);