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)
commit6e611a18390690375a60392061fb6177ef24c7a8
tree33492248bebbb0752a51e5298ab473e30c8f3b08
parentc0746716215b0feb8d64ca819af5ee780087984a
parentdb53a2306f62f05faa67e6f3c60ee55a9b8e4776
Merge commit 'db53a2306f62f05faa67e6f3c60ee55a9b8e4776'

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

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