Commit 5c2ccf83 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '7abd35a1'

* commit '7abd35a1':
  avformat: Add av_cold attributes to init functions missing them

Conflicts:
	libavformat/rtpdec_xiph.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents f5846dc9 7abd35a1
...@@ -24,13 +24,14 @@ ...@@ -24,13 +24,14 @@
* G.723.1 demuxer * G.723.1 demuxer
*/ */
#include "libavutil/attributes.h"
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
static const uint8_t frame_size[4] = { 24, 20, 4, 1 }; 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; AVStream *st;
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavutil/fifo.h" #include "libavutil/fifo.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
...@@ -293,7 +294,7 @@ static int get_system_header_size(AVFormatContext *ctx) ...@@ -293,7 +294,7 @@ static int get_system_header_size(AVFormatContext *ctx)
return buf_index; return buf_index;
} }
static int mpeg_mux_init(AVFormatContext *ctx) static av_cold int mpeg_mux_init(AVFormatContext *ctx)
{ {
MpegMuxContext *s = ctx->priv_data; MpegMuxContext *s = ctx->priv_data;
int bitrate, i, mpa_id, mpv_id, mps_id, ac3_id, dts_id, lpcm_id, j; int bitrate, i, mpa_id, mpv_id, mps_id, ac3_id, dts_id, lpcm_id, j;
......
...@@ -18,11 +18,13 @@ ...@@ -18,11 +18,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "avformat.h" #include "avformat.h"
#include "rtpdec_formats.h" #include "rtpdec_formats.h"
#define RTP_G726_HANDLER(bitrate) \ #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]; \ AVStream *stream = s->streams[st_index]; \
AVCodecContext *codec = stream->codec; \ AVCodecContext *codec = stream->codec; \
......
...@@ -21,9 +21,11 @@ ...@@ -21,9 +21,11 @@
#include "avformat.h" #include "avformat.h"
#include "rtpdec_formats.h" #include "rtpdec_formats.h"
#include "libavutil/attributes.h"
#include "libavutil/intreadwrite.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) if (st_index < 0)
return 0; return 0;
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "avformat.h" #include "avformat.h"
#include "rtpdec_formats.h" #include "rtpdec_formats.h"
#include "libavutil/attributes.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavcodec/get_bits.h" #include "libavcodec/get_bits.h"
...@@ -55,7 +56,7 @@ static void h263_free_context(PayloadContext *data) ...@@ -55,7 +56,7 @@ static void h263_free_context(PayloadContext *data)
av_free(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) if (st_index < 0)
return 0; return 0;
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
* FU-B packet types) * FU-B packet types)
*/ */
#include "libavutil/attributes.h"
#include "libavutil/base64.h" #include "libavutil/base64.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavcodec/get_bits.h" #include "libavcodec/get_bits.h"
...@@ -338,7 +339,8 @@ static void h264_free_context(PayloadContext *data) ...@@ -338,7 +339,8 @@ static void h264_free_context(PayloadContext *data)
av_free(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) if (st_index < 0)
return 0; return 0;
......
...@@ -19,10 +19,11 @@ ...@@ -19,10 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * 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 "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) if (st_index < 0)
return 0; return 0;
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "rtpdec_formats.h" #include "rtpdec_formats.h"
#include "internal.h" #include "internal.h"
#include "libavutil/attributes.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavcodec/get_bits.h" #include "libavcodec/get_bits.h"
...@@ -252,7 +253,8 @@ static int parse_sdp_line(AVFormatContext *s, int st_index, ...@@ -252,7 +253,8 @@ static int parse_sdp_line(AVFormatContext *s, int st_index,
return 0; 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) if (st_index < 0)
return 0; return 0;
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "mpegts.h" #include "mpegts.h"
#include "rtpdec_formats.h" #include "rtpdec_formats.h"
...@@ -43,7 +44,8 @@ static void mpegts_free_context(PayloadContext *data) ...@@ -43,7 +44,8 @@ static void mpegts_free_context(PayloadContext *data)
av_free(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); data->ts = ff_mpegts_parse_open(ctx);
if (!data->ts) if (!data->ts)
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
* @author Josh Allmann <joshua.allmann@gmail.com> * @author Josh Allmann <joshua.allmann@gmail.com>
*/ */
#include "libavutil/attributes.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/base64.h" #include "libavutil/base64.h"
...@@ -69,8 +70,8 @@ static void xiph_free_context(PayloadContext * data) ...@@ -69,8 +70,8 @@ static void xiph_free_context(PayloadContext * data)
av_free(data); av_free(data);
} }
static int xiph_vorbis_init(AVFormatContext *ctx, int st_index, static av_cold int xiph_vorbis_init(AVFormatContext *ctx, int st_index,
PayloadContext *data) PayloadContext *data)
{ {
if (st_index < 0) if (st_index < 0)
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment