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_mpeg4.c | |
| parent | f5846dc98cee1fd2530565a9a87c602714eb597b (diff) | |
| parent | 7abd35a1ffaecfd79fa07b801621ee11ab595c43 (diff) | |
| download | ffmpeg-5c2ccf83df3bfea03c843910c41ee99bd4d64129.tar.gz | |
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_mpeg4.c')
| -rw-r--r-- | libavformat/rtpdec_mpeg4.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/rtpdec_mpeg4.c b/libavformat/rtpdec_mpeg4.c index 3f1f244b83..571b7392e0 100644 --- a/libavformat/rtpdec_mpeg4.c +++ b/libavformat/rtpdec_mpeg4.c @@ -29,6 +29,7 @@ #include "rtpdec_formats.h" #include "internal.h" +#include "libavutil/attributes.h" #include "libavutil/avstring.h" #include "libavcodec/get_bits.h" @@ -252,7 +253,8 @@ static int parse_sdp_line(AVFormatContext *s, int st_index, return 0; } -static int init_video(AVFormatContext *s, int st_index, PayloadContext *data) +static av_cold int init_video(AVFormatContext *s, int st_index, + PayloadContext *data) { if (st_index < 0) return 0; |