Merge commit 'bd8ac882140a38868c33c000a430a1292a352533'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 May 2013 08:27:54 +0000 (10:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 May 2013 08:28:27 +0000 (10:28 +0200)
* commit 'bd8ac882140a38868c33c000a430a1292a352533':
  avcodec: Add av_cold attributes to end functions missing them

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/avfft.c
libavcodec/bgmc.c
libavcodec/dnxhdenc.c
libavcodec/libxvid_rc.c
libavcodec/mpeg12dec.c
libavcodec/roqvideoenc.c
libavcodec/svq3.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
   *
   * You will know you have these parameters passed correctly when the decoder
   * correctly decodes this file:
 - *  http://samples.libav.org/V-codecs/SVQ3/Vertical400kbit.sorenson3.mov
 + *  http://samples.mplayerhq.hu/V-codecs/SVQ3/Vertical400kbit.sorenson3.mov
   */
+ #include "libavutil/attributes.h"
  #include "internal.h"
  #include "avcodec.h"
  #include "mpegvideo.h"