Merge commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 12:49:10 +0000 (14:49 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 12:49:10 +0000 (14:49 +0200)
commitb95534bb674acfe7689ca03cb4fa215c28f8f44f
treed111b6ccd31e8f1ce79a8f475b511861882ac1f6
parent46ff31d39c2e3dcb5237ecfac45316c0d13a57ed
parente47b8bbf0b54599d44b9330eb4d68cdde4f6d298
Merge commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298'

* commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298':
  avcodec: Bump micro version after changing public JPEG 2000 defines

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