xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2025-02-03 02:32:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit 'db53a2306f62f05faa67e6f3c60ee55a9b8e4776'

Browse Source 
* commit 'db53a2306f62f05faa67e6f3c60ee55a9b8e4776':
  jpeg2000: Do not warn about known and skippable markers

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-09-12 13:16:13 +02:00
commit 6e611a1839
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/jpeg2000dec.c
View File

@ -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);