Merge commit 'ad61da054bd8c74a5d5b38d80846228fc6147108'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 12:41:05 +0000 (14:41 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 12:41:05 +0000 (14:41 +0200)
commit46ff31d39c2e3dcb5237ecfac45316c0d13a57ed
treee67478d22560b7ce2cc3834fd3cf461afcc8e223
parent7c6ae9ca0489aa3f355973f66ed7c28097ff6126
parentad61da054bd8c74a5d5b38d80846228fc6147108
Merge commit 'ad61da054bd8c74a5d5b38d80846228fc6147108'

* commit 'ad61da054bd8c74a5d5b38d80846228fc6147108':
  jpeg2000: Fix profile define values

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