RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '093804a93cc5da3f95f98265a5df116912443cec' 

* commit '093804a93cc5da3f95f98265a5df116912443cec':
  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: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-05 11:42:18 +02:00
parent 0aa095483d 093804a93c
commit a8ff830b79
11 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/af_amix.c
View File

@ -28,6 +28,7 @@
* output.
*/
#include "libavutil/attributes.h"
#include "libavutil/audio_fifo.h"
#include "libavutil/avassert.h"
#include "libavutil/avstring.h"
@ -483,7 +484,7 @@ fail:
return ret;
}
static int init(AVFilterContext *ctx)
static av_cold int init(AVFilterContext *ctx)
{
MixContext *s = ctx->priv;
int i;
@ -505,7 +506,7 @@ static int init(AVFilterContext *ctx)
return 0;
}
static void uninit(AVFilterContext *ctx)
static av_cold void uninit(AVFilterContext *ctx)
{
int i;
MixContext *s = ctx->priv;

3
libavfilter/af_ashowinfo.c
View File

@ -27,6 +27,7 @@
#include <stddef.h>
#include "libavutil/adler32.h"
#include "libavutil/attributes.h"
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "libavutil/mem.h"
@ -49,7 +50,7 @@ typedef struct AShowInfoContext {
uint64_t frame;
} AShowInfoContext;
static void uninit(AVFilterContext *ctx)
static av_cold void uninit(AVFilterContext *ctx)
{
AShowInfoContext *s = ctx->priv;
av_freep(&s->plane_checksums);

5
libavfilter/af_asyncts.c
View File

@ -17,6 +17,7 @@
*/
#include "libavresample/avresample.h"
#include "libavutil/attributes.h"
#include "libavutil/audio_fifo.h"
#include "libavutil/common.h"
#include "libavutil/mathematics.h"
@ -60,7 +61,7 @@ static const AVOption asyncts_options[] = {
AVFILTER_DEFINE_CLASS(asyncts);
static int init(AVFilterContext *ctx)
static av_cold int init(AVFilterContext *ctx)
{
ASyncContext *s = ctx->priv;
@ -70,7 +71,7 @@ static int init(AVFilterContext *ctx)
return 0;
}
static void uninit(AVFilterContext *ctx)
static av_cold void uninit(AVFilterContext *ctx)
{
ASyncContext *s = ctx->priv;

3
libavfilter/af_channelsplit.c
View File

@ -23,6 +23,7 @@
* Split an audio stream into per-channel streams.
*/
#include "libavutil/attributes.h"
#include "libavutil/channel_layout.h"
#include "libavutil/internal.h"
#include "libavutil/opt.h"
@ -49,7 +50,7 @@ static const AVOption channelsplit_options[] = {
AVFILTER_DEFINE_CLASS(channelsplit);
static int init(AVFilterContext *ctx)
static av_cold int init(AVFilterContext *ctx)
{
ChannelSplitContext *s = ctx->priv;
int nb_channels;

4
libavfilter/af_join.c
View File

@ -187,7 +187,7 @@ static int parse_maps(AVFilterContext *ctx)
return 0;
}
static int join_init(AVFilterContext *ctx)
static av_cold int join_init(AVFilterContext *ctx)
{
JoinContext *s = ctx->priv;
int ret, i;
@ -235,7 +235,7 @@ fail:
return ret;
}
static void join_uninit(AVFilterContext *ctx)
static av_cold void join_uninit(AVFilterContext *ctx)
{
JoinContext *s = ctx->priv;
int i;

2
libavfilter/af_volume.c
View File

@ -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));
}
static void volume_init(VolumeContext *vol)
static av_cold void volume_init(VolumeContext *vol)
{
vol->samples_align = 1;

5
libavfilter/split.c
View File

@ -25,6 +25,7 @@
#include <stdio.h>
#include "libavutil/attributes.h"
#include "libavutil/internal.h"
#include "libavutil/mem.h"
#include "libavutil/opt.h"
@ -39,7 +40,7 @@ typedef struct SplitContext {
int nb_outputs;
} SplitContext;
static int split_init(AVFilterContext *ctx)
static av_cold int split_init(AVFilterContext *ctx)
{
SplitContext *s = ctx->priv;
int i;
@ -58,7 +59,7 @@ static int split_init(AVFilterContext *ctx)
return 0;
}
static void split_uninit(AVFilterContext *ctx)
static av_cold void split_uninit(AVFilterContext *ctx)
{
int i;

2
libavfilter/src_movie.c
View File

@ -30,6 +30,8 @@
/* #define DEBUG */
#include <float.h>
#include "libavutil/attributes.h"
#include "libavutil/avstring.h"
#include "libavutil/avassert.h"
#include "libavutil/opt.h"

5
libavfilter/vf_hqdn3d.c
View File

@ -29,6 +29,7 @@
#include <float.h>
#include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/common.h"
#include "libavutil/pixdesc.h"
#include "libavutil/intreadwrite.h"
@ -181,7 +182,7 @@ static int16_t *precalc_coefs(double dist25, int depth)
#define PARAM2_DEFAULT 3.0
#define PARAM3_DEFAULT 6.0
static int init(AVFilterContext *ctx)
static av_cold int init(AVFilterContext *ctx)
{
HQDN3DContext *hqdn3d = ctx->priv;
@ -201,7 +202,7 @@ static int init(AVFilterContext *ctx)
return 0;
}
static void uninit(AVFilterContext *ctx)
static av_cold void uninit(AVFilterContext *ctx)
{
HQDN3DContext *hqdn3d = ctx->priv;

7
libavfilter/vf_lut.c
View File

@ -24,6 +24,7 @@
* value, and apply it to input video.
*/
#include "libavutil/attributes.h"
#include "libavutil/common.h"
#include "libavutil/eval.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
#define lutyuv_options options
AVFILTER_DEFINE_CLASS(lutyuv);
static int lutyuv_init(AVFilterContext *ctx)
static av_cold int lutyuv_init(AVFilterContext *ctx)
{
LutContext *lut = ctx->priv;
@ -388,7 +389,7 @@ DEFINE_LUT_FILTER(lutyuv, "Compute and apply a lookup table to the YUV input vid
#define lutrgb_options options
AVFILTER_DEFINE_CLASS(lutrgb);
static int lutrgb_init(AVFilterContext *ctx)
static av_cold int lutrgb_init(AVFilterContext *ctx)
{
LutContext *lut = ctx->priv;
@ -409,7 +410,7 @@ static const AVOption negate_options[] = {
AVFILTER_DEFINE_CLASS(negate);
static int negate_init(AVFilterContext *ctx)
static av_cold int negate_init(AVFilterContext *ctx)
{
LutContext *lut = ctx->priv;
int i;

3
libavfilter/x86/af_volume_init.c
View File

@ -17,6 +17,7 @@
*/
#include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/samplefmt.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,
void ff_scale_samples_s32_avx(uint8_t *dst, const uint8_t *src, int len,
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();
enum AVSampleFormat sample_fmt = av_get_packed_sample_fmt(vol->sample_fmt);