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

Michael Niedermayer committed 13 years ago

Commit a8ff8302 parents 0aa0954 093804a11 files · +27 −17Browse files

Unified · Split

11 files

libavfilter/af_amix.c +3 −2
libavfilter/af_ashowinfo.c +2 −1
libavfilter/af_asyncts.c +3 −2
libavfilter/af_channelsplit.c +2 −1
libavfilter/af_join.c +2 −2
libavfilter/af_volume.c +1 −1
libavfilter/split.c +3 −2
libavfilter/src_movie.c +2 −0
libavfilter/vf_hqdn3d.c +3 −2
libavfilter/vf_lut.c +4 −3
libavfilter/x86/af_volume_init.c +2 −1

libavfilter/af_amix.c+3−2

@@ -28,6 +28,7 @@ · 27 unmodified lines
28	28	* output.
29	29	*/
30	30
	31	+#include "libavutil/attributes.h"
31	32	#include "libavutil/audio_fifo.h"
32	33	#include "libavutil/avassert.h"
33	34	#include "libavutil/avstring.h"
@@ -483,7 +484,7 @@ fail: · 449 unmodified lines
483	484	return ret;
484	485	}
485	486
486		−static int init(AVFilterContext *ctx)
	487	+static av_cold int init(AVFilterContext *ctx)
487	488	{
488	489	MixContext *s = ctx->priv;
489	490	int i;
@@ -505,7 +506,7 @@ static int init(AVFilterContext *ctx) · 15 unmodified lines
505	506	return 0;
506	507	}
507	508
508		−static void uninit(AVFilterContext *ctx)
	509	+static av_cold void uninit(AVFilterContext *ctx)
509	510	{
510	511	int i;
511	512	MixContext *s = ctx->priv;

libavfilter/af_ashowinfo.c+2−1

@@ -27,6 +27,7 @@ · 26 unmodified lines
27	27	#include <stddef.h>
28	28
29	29	#include "libavutil/adler32.h"
	30	+#include "libavutil/attributes.h"
30	31	#include "libavutil/channel_layout.h"
31	32	#include "libavutil/common.h"
32	33	#include "libavutil/mem.h"
@@ -49,7 +50,7 @@ typedef struct AShowInfoContext { · 16 unmodified lines
49	50	uint64_t frame;
50	51	} AShowInfoContext;
51	52
52		−static void uninit(AVFilterContext *ctx)
	53	+static av_cold void uninit(AVFilterContext *ctx)
53	54	{
54	55	AShowInfoContext *s = ctx->priv;
55	56	av_freep(&s->plane_checksums);

libavfilter/af_asyncts.c+3−2

@@ -17,6 +17,7 @@ · 16 unmodified lines
17	17	*/
18	18
19	19	#include "libavresample/avresample.h"
	20	+#include "libavutil/attributes.h"
20	21	#include "libavutil/audio_fifo.h"
21	22	#include "libavutil/common.h"
22	23	#include "libavutil/mathematics.h"
@@ -60,7 +61,7 @@ static const AVOption asyncts_options[] = { · 37 unmodified lines
60	61
61	62	AVFILTER_DEFINE_CLASS(asyncts);
62	63
63		−static int init(AVFilterContext *ctx)
	64	+static av_cold int init(AVFilterContext *ctx)
64	65	{
65	66	ASyncContext *s = ctx->priv;
66	67
@@ -70,7 +71,7 @@ static int init(AVFilterContext *ctx) · 3 unmodified lines
70	71	return 0;
71	72	}
72	73
73		−static void uninit(AVFilterContext *ctx)
	74	+static av_cold void uninit(AVFilterContext *ctx)
74	75	{
75	76	ASyncContext *s = ctx->priv;
76	77

libavfilter/af_channelsplit.c+2−1

@@ -23,6 +23,7 @@ · 22 unmodified lines
23	23	* Split an audio stream into per-channel streams.
24	24	*/
25	25
	26	+#include "libavutil/attributes.h"
26	27	#include "libavutil/channel_layout.h"
27	28	#include "libavutil/internal.h"
28	29	#include "libavutil/opt.h"
@@ -49,7 +50,7 @@ static const AVOption channelsplit_options[] = { · 20 unmodified lines
49	50
50	51	AVFILTER_DEFINE_CLASS(channelsplit);
51	52
52		−static int init(AVFilterContext *ctx)
	53	+static av_cold int init(AVFilterContext *ctx)
53	54	{
54	55	ChannelSplitContext *s = ctx->priv;
55	56	int nb_channels;

libavfilter/af_join.c+2−2

@@ -187,7 +187,7 @@ static int parse_maps(AVFilterContext *ctx) · 186 unmodified lines
187	187	return 0;
188	188	}
189	189
190		−static int join_init(AVFilterContext *ctx)
	190	+static av_cold int join_init(AVFilterContext *ctx)
191	191	{
192	192	JoinContext *s = ctx->priv;
193	193	int ret, i;
@@ -235,7 +235,7 @@ fail: · 41 unmodified lines
235	235	return ret;
236	236	}
237	237
238		−static void join_uninit(AVFilterContext *ctx)
	238	+static av_cold void join_uninit(AVFilterContext *ctx)
239	239	{
240	240	JoinContext *s = ctx->priv;
241	241	int i;

libavfilter/af_volume.c+1−1

@@ -165,7 +165,7 @@ static inline void scale_samples_s32(uint8_t dst, const uint8_t src, · 164 unmodified lines
165	165	smp_dst[i] = av_clipl_int32((((int64_t)smp_src[i] * volume + 128) >> 8));
166	166	}
167	167
168		−static void volume_init(VolumeContext *vol)
	168	+static av_cold void volume_init(VolumeContext *vol)
169	169	{
170	170	vol->samples_align = 1;
171	171

libavfilter/split.c+3−2

@@ -25,6 +25,7 @@ · 24 unmodified lines
25	25
26	26	#include <stdio.h>
27	27
	28	+#include "libavutil/attributes.h"
28	29	#include "libavutil/internal.h"
29	30	#include "libavutil/mem.h"
30	31	#include "libavutil/opt.h"
@@ -39,7 +40,7 @@ typedef struct SplitContext { · 8 unmodified lines
39	40	int nb_outputs;
40	41	} SplitContext;
41	42
42		−static int split_init(AVFilterContext *ctx)
	43	+static av_cold int split_init(AVFilterContext *ctx)
43	44	{
44	45	SplitContext *s = ctx->priv;
45	46	int i;
@@ -58,7 +59,7 @@ static int split_init(AVFilterContext *ctx) · 12 unmodified lines
58	59	return 0;
59	60	}
60	61
61		−static void split_uninit(AVFilterContext *ctx)
	62	+static av_cold void split_uninit(AVFilterContext *ctx)
62	63	{
63	64	int i;
64	65

libavfilter/src_movie.c+2−0

@@ -30,6 +30,8 @@ · 29 unmodified lines
30	30	/* #define DEBUG */
31	31
32	32	#include <float.h>
	33	+
	34	+#include "libavutil/attributes.h"
33	35	#include "libavutil/avstring.h"
34	36	#include "libavutil/avassert.h"
35	37	#include "libavutil/opt.h"

libavfilter/vf_hqdn3d.c+3−2

@@ -29,6 +29,7 @@ · 28 unmodified lines
29	29	#include <float.h>
30	30
31	31	#include "config.h"
	32	+#include "libavutil/attributes.h"
32	33	#include "libavutil/common.h"
33	34	#include "libavutil/pixdesc.h"
34	35	#include "libavutil/intreadwrite.h"
@@ -181,7 +182,7 @@ static int16_t *precalc_coefs(double dist25, int depth) · 146 unmodified lines
181	182	#define PARAM2_DEFAULT 3.0
182	183	#define PARAM3_DEFAULT 6.0
183	184
184		−static int init(AVFilterContext *ctx)
	185	+static av_cold int init(AVFilterContext *ctx)
185	186	{
186	187	HQDN3DContext *hqdn3d = ctx->priv;
187	188
@@ -201,7 +202,7 @@ static int init(AVFilterContext *ctx) · 13 unmodified lines
201	202	return 0;
202	203	}
203	204
204		−static void uninit(AVFilterContext *ctx)
	205	+static av_cold void uninit(AVFilterContext *ctx)
205	206	{
206	207	HQDN3DContext *hqdn3d = ctx->priv;
207	208

libavfilter/vf_lut.c+4−3

@@ -24,6 +24,7 @@ · 23 unmodified lines
24	24	* value, and apply it to input video.
25	25	*/
26	26
	27	+#include "libavutil/attributes.h"
27	28	#include "libavutil/common.h"
28	29	#include "libavutil/eval.h"
29	30	#include "libavutil/opt.h"
@@ -371,7 +372,7 @@ DEFINE_LUT_FILTER(lut, "Compute and apply a lookup table to the RGB/YUV input vi · 341 unmodified lines
371	372	#define lutyuv_options options
372	373	AVFILTER_DEFINE_CLASS(lutyuv);
373	374
374		−static int lutyuv_init(AVFilterContext *ctx)
	375	+static av_cold int lutyuv_init(AVFilterContext *ctx)
375	376	{
376	377	LutContext *lut = ctx->priv;
377	378
@@ -388,7 +389,7 @@ DEFINE_LUT_FILTER(lutyuv, "Compute and apply a lookup table to the YUV input vid · 10 unmodified lines
388	389	#define lutrgb_options options
389	390	AVFILTER_DEFINE_CLASS(lutrgb);
390	391
391		−static int lutrgb_init(AVFilterContext *ctx)
	392	+static av_cold int lutrgb_init(AVFilterContext *ctx)
392	393	{
393	394	LutContext *lut = ctx->priv;
394	395
@@ -409,7 +410,7 @@ static const AVOption negate_options[] = { · 14 unmodified lines
409	410
410	411	AVFILTER_DEFINE_CLASS(negate);
411	412
412		−static int negate_init(AVFilterContext *ctx)
	413	+static av_cold int negate_init(AVFilterContext *ctx)
413	414	{
414	415	LutContext *lut = ctx->priv;
415	416	int i;

libavfilter/x86/af_volume_init.c+2−1

@@ -17,6 +17,7 @@ · 16 unmodified lines
17	17	*/
18	18
19	19	#include "config.h"
	20	+#include "libavutil/attributes.h"
20	21	#include "libavutil/cpu.h"
21	22	#include "libavutil/samplefmt.h"
22	23	#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, · 9 unmodified lines
32	33	void ff_scale_samples_s32_avx(uint8_t dst, const uint8_t src, int len,
33	34	int volume);
34	35
35		−void ff_volume_init_x86(VolumeContext *vol)
	36	+av_cold void ff_volume_init_x86(VolumeContext *vol)
36	37	{
37	38	int mm_flags = av_get_cpu_flags();
38	39	enum AVSampleFormat sample_fmt = av_get_packed_sample_fmt(vol->sample_fmt);

Merge commit '093804a93cc5da3f95f98265a5df116912443cec'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code