Michael Niedermayer f9cd317223 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>

2014-06-17 20:42:10 +02:00

3.2 KiB

Raw Blame History

View Raw