Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 May 2013 08:19:56 +0000 (10:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 May 2013 08:19:56 +0000 (10:19 +0200)
* commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43':
  avformat: Add av_cold attributes to init functions missing them

Conflicts:
libavformat/rtpdec_xiph.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/g723_1.c
libavformat/mpegenc.c
libavformat/rtpdec_g726.c
libavformat/rtpdec_h263.c
libavformat/rtpdec_h264.c
libavformat/rtpdec_mpeg12.c
libavformat/rtpdec_mpeg4.c
libavformat/rtpdec_mpegts.c
libavformat/rtpdec_xiph.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -27,7 -27,7 +27,8 @@@
   * @author Josh Allmann <joshua.allmann@gmail.com>
   */
  
+ #include "libavutil/attributes.h"
 +#include "libavutil/avassert.h"
  #include "libavutil/avstring.h"
  #include "libavutil/base64.h"
  #include "libavcodec/bytestream.h"