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>

diff --cc libavcodec/jpeg2000.c
index 3762a9bb4bebffda74cdaa5550b5876bf2323ca0,74e4f15de8298befe1ed2d606374f0f52b6f44eb..200bb6d3551d188631f9ca0519f98bf6b3fe21da
--- 1/libavcodec/jpeg2000.c
--- 2/libavcodec/jpeg2000.c
+++ b/libavcodec/jpeg2000.c
@@@ -25,7 -25,7 +25,8 @@@
   * JPEG 2000 image encoder and decoder common functions
   */
  
+ #include "libavutil/attributes.h"
 +#include "libavutil/avassert.h"
  #include "libavutil/common.h"
  #include "libavutil/mem.h"
  #include "avcodec.h"

diff --cc libavcodec/jpeg2000dec.c
index fbfb7d1e5f07cfa27672bdf97205bda4ef235872,7d081eadd1fe07c4d90131e808c62a388c87fc2a..d6204bbfc7bc1770cd24ada19bd6e67573a47a96
--- 1/libavcodec/jpeg2000dec.c
--- 2/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@@ -27,10 -27,9 +27,11 @@@
  
  #include <inttypes.h>
  
+ #include "libavutil/attributes.h"
 +#include "libavutil/avassert.h"
  #include "libavutil/common.h"
  #include "libavutil/opt.h"
 +#include "libavutil/pixdesc.h"
  #include "avcodec.h"
  #include "bytestream.h"
  #include "internal.h"

diff --cc libavcodec/mqc.c
Simple merge