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>

10 files changed, 27 insertions, 12 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;
 
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;
diff --git a/libavformat/rtpdec_g726.c b/libavformat/rtpdec_g726.c
index ec37f09155..7e9ef56e06 100644
--- a/libavformat/rtpdec_g726.c
+++ b/libavformat/rtpdec_g726.c
@@ -18,11 +18,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/attributes.h"
 #include "avformat.h"
 #include "rtpdec_formats.h"
 
 #define RTP_G726_HANDLER(bitrate) \
-static int g726_ ## bitrate ##_init(AVFormatContext *s, int st_index, PayloadContext *data) \
+static av_cold int g726_ ## bitrate ##_init(AVFormatContext *s, int st_index, \
+                                            PayloadContext *data) \
 { \
     AVStream *stream = s->streams[st_index]; \
     AVCodecContext *codec = stream->codec; \
diff --git a/libavformat/rtpdec_h263.c b/libavformat/rtpdec_h263.c
index dd7aa60fd5..ae4cc27040 100644
--- a/libavformat/rtpdec_h263.c
+++ b/libavformat/rtpdec_h263.c
@@ -21,9 +21,11 @@
 
 #include "avformat.h"
 #include "rtpdec_formats.h"
+#include "libavutil/attributes.h"
 #include "libavutil/intreadwrite.h"
 
-static int h263_init(AVFormatContext *ctx, int st_index, PayloadContext *data)
+static av_cold int h263_init(AVFormatContext *ctx, int st_index,
+                             PayloadContext *data)
 {
     if (st_index < 0)
         return 0;
diff --git a/libavformat/rtpdec_h263_rfc2190.c b/libavformat/rtpdec_h263_rfc2190.c
index 4b6e996770..116db75065 100644
--- a/libavformat/rtpdec_h263_rfc2190.c
+++ b/libavformat/rtpdec_h263_rfc2190.c
@@ -27,6 +27,7 @@
 
 #include "avformat.h"
 #include "rtpdec_formats.h"
+#include "libavutil/attributes.h"
 #include "libavutil/intreadwrite.h"
 #include "libavcodec/get_bits.h"
 
@@ -55,7 +56,7 @@ static void h263_free_context(PayloadContext *data)
     av_free(data);
 }
 
-static int h263_init(AVFormatContext *ctx, int st_index, PayloadContext *data)
+static av_cold int h263_init(AVFormatContext *ctx, int st_index, PayloadContext *data)
 {
     if (st_index < 0)
         return 0;
diff --git a/libavformat/rtpdec_h264.c b/libavformat/rtpdec_h264.c
index d1133b78e1..be657c0ccc 100644
--- a/libavformat/rtpdec_h264.c
+++ b/libavformat/rtpdec_h264.c
@@ -33,6 +33,7 @@
  *                        FU-B packet types)
  */
 
+#include "libavutil/attributes.h"
 #include "libavutil/base64.h"
 #include "libavutil/avstring.h"
 #include "libavcodec/get_bits.h"
@@ -338,7 +339,8 @@ static void h264_free_context(PayloadContext *data)
     av_free(data);
 }
 
-static int h264_init(AVFormatContext *s, int st_index, PayloadContext *data)
+static av_cold int h264_init(AVFormatContext *s, int st_index,
+                             PayloadContext *data)
 {
     if (st_index < 0)
         return 0;
diff --git a/libavformat/rtpdec_mpeg12.c b/libavformat/rtpdec_mpeg12.c
index 82e58a097a..d73ff1e144 100644
--- a/libavformat/rtpdec_mpeg12.c
+++ b/libavformat/rtpdec_mpeg12.c
@@ -19,10 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "rtpdec_formats.h"
+#include "libavutil/attributes.h"
 #include "libavutil/intreadwrite.h"
+#include "rtpdec_formats.h"
 
-static int mpeg_init(AVFormatContext *ctx, int st_index, PayloadContext *data)
+static av_cold int mpeg_init(AVFormatContext *ctx, int st_index, PayloadContext *data)
 {
     if (st_index < 0)
         return 0;
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;
diff --git a/libavformat/rtpdec_mpegts.c b/libavformat/rtpdec_mpegts.c
index cbb8eb49f7..5b851c4fd7 100644
--- a/libavformat/rtpdec_mpegts.c
+++ b/libavformat/rtpdec_mpegts.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/attributes.h"
 #include "mpegts.h"
 #include "rtpdec_formats.h"
 
@@ -43,7 +44,8 @@ static void mpegts_free_context(PayloadContext *data)
     av_free(data);
 }
 
-static int mpegts_init(AVFormatContext *ctx, int st_index, PayloadContext *data)
+static av_cold int mpegts_init(AVFormatContext *ctx, int st_index,
+                               PayloadContext *data)
 {
     data->ts = ff_mpegts_parse_open(ctx);
     if (!data->ts)
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;