Merge commit 'db53a2306f62f05faa67e6f3c60ee55a9b8e4776'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 11:16:13 +0000 (13:16 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 11:16:13 +0000 (13:16 +0200)
* commit 'db53a2306f62f05faa67e6f3c60ee55a9b8e4776':
  jpeg2000: Do not warn about known and skippable markers

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/jpeg2000dec.c

@@@ -1896,6 -1290,10 +1896,8 @@@ static int jpeg2000_read_main_headers(J
                  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);