Merge commit 'fe4d5fe9361162f9033ff1bd84bfc1b2091ba785'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Jun 2014 18:42:10 +0000 (20:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Jun 2014 18:42:10 +0000 (20:42 +0200)
commitf9cd317223cb2c7be41c1c0ae2fdc31976247547
tree05c6c4351e3c08742278047f9f361bf4d6982269
parenta50c6f99b44e014ee13fedac88f6a1835ade477a
parentfe4d5fe9361162f9033ff1bd84bfc1b2091ba785
Merge commit 'fe4d5fe9361162f9033ff1bd84bfc1b2091ba785'

* commit 'fe4d5fe9361162f9033ff1bd84bfc1b2091ba785':
  jpeg2000: Mark static data init functions as av_cold

Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c
libavcodec/mqc.c