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)
* commit 'ad61da054bd8c74a5d5b38d80846228fc6147108':
  jpeg2000: Fix profile define values

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

Simple merge