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/g723_1.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/g723_1.c')
| -rw-r--r-- | libavformat/g723_1.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/g723_1.c b/libavformat/g723_1.c index 8d35f885a8..4f3ce8f0ae 100644 --- a/libavformat/g723_1.c +++ b/libavformat/g723_1.c @@ -24,13 +24,14 @@ * G.723.1 demuxer */ +#include "libavutil/attributes.h" #include "libavutil/channel_layout.h" #include "avformat.h" #include "internal.h" static const uint8_t frame_size[4] = { 24, 20, 4, 1 }; -static int g723_1_init(AVFormatContext *s) +static av_cold int g723_1_init(AVFormatContext *s) { AVStream *st; |