diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-12 13:16:13 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-12 13:16:13 +0200 |
| commit | 6e611a18390690375a60392061fb6177ef24c7a8 (patch) | |
| tree | 33492248bebbb0752a51e5298ab473e30c8f3b08 /libavcodec | |
| parent | c0746716215b0feb8d64ca819af5ee780087984a (diff) | |
| parent | db53a2306f62f05faa67e6f3c60ee55a9b8e4776 (diff) | |
| download | ffmpeg-6e611a18390690375a60392061fb6177ef24c7a8.tar.gz | |
Merge commit 'db53a2306f62f05faa67e6f3c60ee55a9b8e4776'
* commit 'db53a2306f62f05faa67e6f3c60ee55a9b8e4776':
jpeg2000: Do not warn about known and skippable markers
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index ed286c6d8c..bb2babb815 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1896,6 +1896,8 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) properties = s->tile[s->curtileno].properties; } break; + case JPEG2000_PLM: + // the PLM marker is ignored case JPEG2000_COM: // the comment is ignored bytestream2_skip(&s->g, len - 2); |