diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 10:19:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 10:19:56 +0200 |
| commit | 5c2ccf83df3bfea03c843910c41ee99bd4d64129 (patch) | |
| tree | b65afff2fa2bbdb0223295c5f0d54ca7107e0e13 /libavformat/rtpdec_xiph.c | |
| parent | f5846dc98cee1fd2530565a9a87c602714eb597b (diff) | |
| parent | 7abd35a1ffaecfd79fa07b801621ee11ab595c43 (diff) | |
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>
Diffstat (limited to 'libavformat/rtpdec_xiph.c')
| -rw-r--r-- | libavformat/rtpdec_xiph.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/rtpdec_xiph.c b/libavformat/rtpdec_xiph.c index eddb781ddb..52a94b3159 100644 --- a/libavformat/rtpdec_xiph.c +++ b/libavformat/rtpdec_xiph.c @@ -27,6 +27,7 @@ * @author Josh Allmann <joshua.allmann@gmail.com> */ +#include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/base64.h" @@ -69,8 +70,8 @@ static void xiph_free_context(PayloadContext * data) av_free(data); } -static int xiph_vorbis_init(AVFormatContext *ctx, int st_index, - PayloadContext *data) +static av_cold int xiph_vorbis_init(AVFormatContext *ctx, int st_index, + PayloadContext *data) { if (st_index < 0) return 0; |