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)
* 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>
1  2 
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c
libavcodec/mqc.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"
  
  #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"
Simple merge