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)
commit5c2ccf83df3bfea03c843910c41ee99bd4d64129
treeb65afff2fa2bbdb0223295c5f0d54ca7107e0e13
parentf5846dc98cee1fd2530565a9a87c602714eb597b
parent7abd35a1ffaecfd79fa07b801621ee11ab595c43
Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'

* commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43':
  avformat: Add av_cold attributes to init functions missing them

Conflicts:
libavformat/rtpdec_xiph.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
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