Commit a8ff830b authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '093804a9'

* commit '093804a9':
  avfilter: Add av_cold attributes to init/uninit functions

Conflicts:
	libavfilter/af_ashowinfo.c
	libavfilter/af_volume.c
	libavfilter/src_movie.c
	libavfilter/vf_lut.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 0aa09548 093804a9
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
* output. * output.
*/ */
#include "libavutil/attributes.h"
#include "libavutil/audio_fifo.h" #include "libavutil/audio_fifo.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
...@@ -483,7 +484,7 @@ fail: ...@@ -483,7 +484,7 @@ fail:
return ret; return ret;
} }
static int init(AVFilterContext *ctx) static av_cold int init(AVFilterContext *ctx)
{ {
MixContext *s = ctx->priv; MixContext *s = ctx->priv;
int i; int i;
...@@ -505,7 +506,7 @@ static int init(AVFilterContext *ctx) ...@@ -505,7 +506,7 @@ static int init(AVFilterContext *ctx)
return 0; return 0;
} }
static void uninit(AVFilterContext *ctx) static av_cold void uninit(AVFilterContext *ctx)
{ {
int i; int i;
MixContext *s = ctx->priv; MixContext *s = ctx->priv;
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <stddef.h> #include <stddef.h>
#include "libavutil/adler32.h" #include "libavutil/adler32.h"
#include "libavutil/attributes.h"
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
...@@ -49,7 +50,7 @@ typedef struct AShowInfoContext { ...@@ -49,7 +50,7 @@ typedef struct AShowInfoContext {
uint64_t frame; uint64_t frame;
} AShowInfoContext; } AShowInfoContext;
static void uninit(AVFilterContext *ctx) static av_cold void uninit(AVFilterContext *ctx)
{ {
AShowInfoContext *s = ctx->priv; AShowInfoContext *s = ctx->priv;
av_freep(&s->plane_checksums); av_freep(&s->plane_checksums);
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
*/ */
#include "libavresample/avresample.h" #include "libavresample/avresample.h"
#include "libavutil/attributes.h"
#include "libavutil/audio_fifo.h" #include "libavutil/audio_fifo.h"
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
...@@ -60,7 +61,7 @@ static const AVOption asyncts_options[] = { ...@@ -60,7 +61,7 @@ static const AVOption asyncts_options[] = {
AVFILTER_DEFINE_CLASS(asyncts); AVFILTER_DEFINE_CLASS(asyncts);
static int init(AVFilterContext *ctx) static av_cold int init(AVFilterContext *ctx)
{ {
ASyncContext *s = ctx->priv; ASyncContext *s = ctx->priv;
...@@ -70,7 +71,7 @@ static int init(AVFilterContext *ctx) ...@@ -70,7 +71,7 @@ static int init(AVFilterContext *ctx)
return 0; return 0;
} }
static void uninit(AVFilterContext *ctx) static av_cold void uninit(AVFilterContext *ctx)
{ {
ASyncContext *s = ctx->priv; ASyncContext *s = ctx->priv;
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
* Split an audio stream into per-channel streams. * Split an audio stream into per-channel streams.
*/ */
#include "libavutil/attributes.h"
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
...@@ -49,7 +50,7 @@ static const AVOption channelsplit_options[] = { ...@@ -49,7 +50,7 @@ static const AVOption channelsplit_options[] = {
AVFILTER_DEFINE_CLASS(channelsplit); AVFILTER_DEFINE_CLASS(channelsplit);
static int init(AVFilterContext *ctx) static av_cold int init(AVFilterContext *ctx)
{ {
ChannelSplitContext *s = ctx->priv; ChannelSplitContext *s = ctx->priv;
int nb_channels; int nb_channels;
......
...@@ -187,7 +187,7 @@ static int parse_maps(AVFilterContext *ctx) ...@@ -187,7 +187,7 @@ static int parse_maps(AVFilterContext *ctx)
return 0; return 0;
} }
static int join_init(AVFilterContext *ctx) static av_cold int join_init(AVFilterContext *ctx)
{ {
JoinContext *s = ctx->priv; JoinContext *s = ctx->priv;
int ret, i; int ret, i;
...@@ -235,7 +235,7 @@ fail: ...@@ -235,7 +235,7 @@ fail:
return ret; return ret;
} }
static void join_uninit(AVFilterContext *ctx) static av_cold void join_uninit(AVFilterContext *ctx)
{ {
JoinContext *s = ctx->priv; JoinContext *s = ctx->priv;
int i; int i;
......
...@@ -165,7 +165,7 @@ static inline void scale_samples_s32(uint8_t *dst, const uint8_t *src, ...@@ -165,7 +165,7 @@ static inline void scale_samples_s32(uint8_t *dst, const uint8_t *src,
smp_dst[i] = av_clipl_int32((((int64_t)smp_src[i] * volume + 128) >> 8)); smp_dst[i] = av_clipl_int32((((int64_t)smp_src[i] * volume + 128) >> 8));
} }
static void volume_init(VolumeContext *vol) static av_cold void volume_init(VolumeContext *vol)
{ {
vol->samples_align = 1; vol->samples_align = 1;
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <stdio.h> #include <stdio.h>
#include "libavutil/attributes.h"
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
...@@ -39,7 +40,7 @@ typedef struct SplitContext { ...@@ -39,7 +40,7 @@ typedef struct SplitContext {
int nb_outputs; int nb_outputs;
} SplitContext; } SplitContext;
static int split_init(AVFilterContext *ctx) static av_cold int split_init(AVFilterContext *ctx)
{ {
SplitContext *s = ctx->priv; SplitContext *s = ctx->priv;
int i; int i;
...@@ -58,7 +59,7 @@ static int split_init(AVFilterContext *ctx) ...@@ -58,7 +59,7 @@ static int split_init(AVFilterContext *ctx)
return 0; return 0;
} }
static void split_uninit(AVFilterContext *ctx) static av_cold void split_uninit(AVFilterContext *ctx)
{ {
int i; int i;
......
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
/* #define DEBUG */ /* #define DEBUG */
#include <float.h> #include <float.h>
#include "libavutil/attributes.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <float.h> #include <float.h>
#include "config.h" #include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
...@@ -181,7 +182,7 @@ static int16_t *precalc_coefs(double dist25, int depth) ...@@ -181,7 +182,7 @@ static int16_t *precalc_coefs(double dist25, int depth)
#define PARAM2_DEFAULT 3.0 #define PARAM2_DEFAULT 3.0
#define PARAM3_DEFAULT 6.0 #define PARAM3_DEFAULT 6.0
static int init(AVFilterContext *ctx) static av_cold int init(AVFilterContext *ctx)
{ {
HQDN3DContext *hqdn3d = ctx->priv; HQDN3DContext *hqdn3d = ctx->priv;
...@@ -201,7 +202,7 @@ static int init(AVFilterContext *ctx) ...@@ -201,7 +202,7 @@ static int init(AVFilterContext *ctx)
return 0; return 0;
} }
static void uninit(AVFilterContext *ctx) static av_cold void uninit(AVFilterContext *ctx)
{ {
HQDN3DContext *hqdn3d = ctx->priv; HQDN3DContext *hqdn3d = ctx->priv;
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
* value, and apply it to input video. * value, and apply it to input video.
*/ */
#include "libavutil/attributes.h"
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/eval.h" #include "libavutil/eval.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
...@@ -371,7 +372,7 @@ DEFINE_LUT_FILTER(lut, "Compute and apply a lookup table to the RGB/YUV input vi ...@@ -371,7 +372,7 @@ DEFINE_LUT_FILTER(lut, "Compute and apply a lookup table to the RGB/YUV input vi
#define lutyuv_options options #define lutyuv_options options
AVFILTER_DEFINE_CLASS(lutyuv); AVFILTER_DEFINE_CLASS(lutyuv);
static int lutyuv_init(AVFilterContext *ctx) static av_cold int lutyuv_init(AVFilterContext *ctx)
{ {
LutContext *lut = ctx->priv; LutContext *lut = ctx->priv;
...@@ -388,7 +389,7 @@ DEFINE_LUT_FILTER(lutyuv, "Compute and apply a lookup table to the YUV input vid ...@@ -388,7 +389,7 @@ DEFINE_LUT_FILTER(lutyuv, "Compute and apply a lookup table to the YUV input vid
#define lutrgb_options options #define lutrgb_options options
AVFILTER_DEFINE_CLASS(lutrgb); AVFILTER_DEFINE_CLASS(lutrgb);
static int lutrgb_init(AVFilterContext *ctx) static av_cold int lutrgb_init(AVFilterContext *ctx)
{ {
LutContext *lut = ctx->priv; LutContext *lut = ctx->priv;
...@@ -409,7 +410,7 @@ static const AVOption negate_options[] = { ...@@ -409,7 +410,7 @@ static const AVOption negate_options[] = {
AVFILTER_DEFINE_CLASS(negate); AVFILTER_DEFINE_CLASS(negate);
static int negate_init(AVFilterContext *ctx) static av_cold int negate_init(AVFilterContext *ctx)
{ {
LutContext *lut = ctx->priv; LutContext *lut = ctx->priv;
int i; int i;
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
*/ */
#include "config.h" #include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/samplefmt.h" #include "libavutil/samplefmt.h"
#include "libavutil/x86/cpu.h" #include "libavutil/x86/cpu.h"
...@@ -32,7 +33,7 @@ void ff_scale_samples_s32_ssse3_atom(uint8_t *dst, const uint8_t *src, int len, ...@@ -32,7 +33,7 @@ void ff_scale_samples_s32_ssse3_atom(uint8_t *dst, const uint8_t *src, int len,
void ff_scale_samples_s32_avx(uint8_t *dst, const uint8_t *src, int len, void ff_scale_samples_s32_avx(uint8_t *dst, const uint8_t *src, int len,
int volume); int volume);
void ff_volume_init_x86(VolumeContext *vol) av_cold void ff_volume_init_x86(VolumeContext *vol)
{ {
int mm_flags = av_get_cpu_flags(); int mm_flags = av_get_cpu_flags();
enum AVSampleFormat sample_fmt = av_get_packed_sample_fmt(vol->sample_fmt); enum AVSampleFormat sample_fmt = av_get_packed_sample_fmt(vol->sample_fmt);
......
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