diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 12:19:56 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 12:19:56 +0400 |
| commit | 5c2ccf83df3bfea03c843910c41ee99bd4d64129 (patch) | |
| tree | b65afff2fa2bbdb0223295c5f0d54ca7107e0e13 /libavformat/mpegenc.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/mpegenc.c')
| -rw-r--r-- | libavformat/mpegenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index b467bb5de5..6f6da5c83d 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/fifo.h" #include "libavutil/log.h" #include "libavutil/mathematics.h" @@ -293,7 +294,7 @@ static int get_system_header_size(AVFormatContext *ctx) return buf_index; } -static int mpeg_mux_init(AVFormatContext *ctx) +static av_cold int mpeg_mux_init(AVFormatContext *ctx) { MpegMuxContext *s = ctx->priv_data; int bitrate, i, mpa_id, mpv_id, mps_id, ac3_id, dts_id, lpcm_id, j; |