History

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
  1. libavfilter/af_amix.c +3 −2
  2. libavfilter/af_ashowinfo.c +2 −1
  3. libavfilter/af_asyncts.c +3 −2
  4. libavfilter/af_channelsplit.c +2 −1
  5. libavfilter/af_join.c +2 −2
  6. libavfilter/af_volume.c +1 −1
  7. libavfilter/split.c +3 −2
  8. libavfilter/src_movie.c +2 −0
  9. libavfilter/vf_hqdn3d.c +3 −2
  10. libavfilter/vf_lut.c +4 −3
  11. libavfilter/x86/af_volume_init.c +2 −1
libavfilter/af_amix.c+3−2
@@ -28,6 +28,7 @@ · 27 unmodified lines
28 * output.28 * output.
29 */29 */
30 30
31#include "libavutil/attributes.h"
31#include "libavutil/audio_fifo.h"32#include "libavutil/audio_fifo.h"
32#include "libavutil/avassert.h"33#include "libavutil/avassert.h"
33#include "libavutil/avstring.h"34#include "libavutil/avstring.h"
@@ -483,7 +484,7 @@ fail: · 449 unmodified lines
483 return ret;484 return ret;
484}485}
485 486
486static int init(AVFilterContext *ctx)487static av_cold int init(AVFilterContext *ctx)
487{488{
488 MixContext *s = ctx->priv;489 MixContext *s = ctx->priv;
489 int i;490 int i;
@@ -505,7 +506,7 @@ static int init(AVFilterContext *ctx) · 15 unmodified lines
505 return 0;506 return 0;
506}507}
507 508
508static void uninit(AVFilterContext *ctx)509static av_cold void uninit(AVFilterContext *ctx)
509{510{
510 int i;511 int i;
511 MixContext *s = ctx->priv;512 MixContext *s = ctx->priv;
libavfilter/af_ashowinfo.c+2−1
@@ -27,6 +27,7 @@ · 26 unmodified lines
27#include <stddef.h>27#include <stddef.h>
28 28
29#include "libavutil/adler32.h"29#include "libavutil/adler32.h"
30#include "libavutil/attributes.h"
30#include "libavutil/channel_layout.h"31#include "libavutil/channel_layout.h"
31#include "libavutil/common.h"32#include "libavutil/common.h"
32#include "libavutil/mem.h"33#include "libavutil/mem.h"
@@ -49,7 +50,7 @@ typedef struct AShowInfoContext { · 16 unmodified lines
49 uint64_t frame;50 uint64_t frame;
50} AShowInfoContext;51} AShowInfoContext;
51 52
52static void uninit(AVFilterContext *ctx)53static av_cold void uninit(AVFilterContext *ctx)
53{54{
54 AShowInfoContext *s = ctx->priv;55 AShowInfoContext *s = ctx->priv;
55 av_freep(&s->plane_checksums);56 av_freep(&s->plane_checksums);
libavfilter/af_asyncts.c+3−2
@@ -17,6 +17,7 @@ · 16 unmodified lines
17 */17 */
18 18
19#include "libavresample/avresample.h"19#include "libavresample/avresample.h"
20#include "libavutil/attributes.h"
20#include "libavutil/audio_fifo.h"21#include "libavutil/audio_fifo.h"
21#include "libavutil/common.h"22#include "libavutil/common.h"
22#include "libavutil/mathematics.h"23#include "libavutil/mathematics.h"
@@ -60,7 +61,7 @@ static const AVOption asyncts_options[] = { · 37 unmodified lines
60 61
61AVFILTER_DEFINE_CLASS(asyncts);62AVFILTER_DEFINE_CLASS(asyncts);
62 63
63static int init(AVFilterContext *ctx)64static av_cold int init(AVFilterContext *ctx)
64{65{
65 ASyncContext *s = ctx->priv;66 ASyncContext *s = ctx->priv;
66 67
@@ -70,7 +71,7 @@ static int init(AVFilterContext *ctx) · 3 unmodified lines
70 return 0;71 return 0;
71}72}
72 73
73static void uninit(AVFilterContext *ctx)74static av_cold void uninit(AVFilterContext *ctx)
74{75{
75 ASyncContext *s = ctx->priv;76 ASyncContext *s = ctx->priv;
76 77
libavfilter/af_channelsplit.c+2−1
@@ -23,6 +23,7 @@ · 22 unmodified lines
23 * Split an audio stream into per-channel streams.23 * Split an audio stream into per-channel streams.
24 */24 */
25 25
26#include "libavutil/attributes.h"
26#include "libavutil/channel_layout.h"27#include "libavutil/channel_layout.h"
27#include "libavutil/internal.h"28#include "libavutil/internal.h"
28#include "libavutil/opt.h"29#include "libavutil/opt.h"
@@ -49,7 +50,7 @@ static const AVOption channelsplit_options[] = { · 20 unmodified lines
49 50
50AVFILTER_DEFINE_CLASS(channelsplit);51AVFILTER_DEFINE_CLASS(channelsplit);
51 52
52static int init(AVFilterContext *ctx)53static av_cold int init(AVFilterContext *ctx)
53{54{
54 ChannelSplitContext *s = ctx->priv;55 ChannelSplitContext *s = ctx->priv;
55 int nb_channels;56 int nb_channels;
libavfilter/af_join.c+2−2
@@ -187,7 +187,7 @@ static int parse_maps(AVFilterContext *ctx) · 186 unmodified lines
187 return 0;187 return 0;
188}188}
189 189
190static int join_init(AVFilterContext *ctx)190static av_cold int join_init(AVFilterContext *ctx)
191{191{
192 JoinContext *s = ctx->priv;192 JoinContext *s = ctx->priv;
193 int ret, i;193 int ret, i;
@@ -235,7 +235,7 @@ fail: · 41 unmodified lines
235 return ret;235 return ret;
236}236}
237 237
238static void join_uninit(AVFilterContext *ctx)238static av_cold void join_uninit(AVFilterContext *ctx)
239{239{
240 JoinContext *s = ctx->priv;240 JoinContext *s = ctx->priv;
241 int i;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 smp_dst[i] = av_clipl_int32((((int64_t)smp_src[i] * volume + 128) >> 8));165 smp_dst[i] = av_clipl_int32((((int64_t)smp_src[i] * volume + 128) >> 8));
166}166}
167 167
168static void volume_init(VolumeContext *vol)168static av_cold void volume_init(VolumeContext *vol)
169{169{
170 vol->samples_align = 1;170 vol->samples_align = 1;
171 171
libavfilter/split.c+3−2
@@ -25,6 +25,7 @@ · 24 unmodified lines
25 25
26#include <stdio.h>26#include <stdio.h>
27 27
28#include "libavutil/attributes.h"
28#include "libavutil/internal.h"29#include "libavutil/internal.h"
29#include "libavutil/mem.h"30#include "libavutil/mem.h"
30#include "libavutil/opt.h"31#include "libavutil/opt.h"
@@ -39,7 +40,7 @@ typedef struct SplitContext { · 8 unmodified lines
39 int nb_outputs;40 int nb_outputs;
40} SplitContext;41} SplitContext;
41 42
42static int split_init(AVFilterContext *ctx)43static av_cold int split_init(AVFilterContext *ctx)
43{44{
44 SplitContext *s = ctx->priv;45 SplitContext *s = ctx->priv;
45 int i;46 int i;
@@ -58,7 +59,7 @@ static int split_init(AVFilterContext *ctx) · 12 unmodified lines
58 return 0;59 return 0;
59}60}
60 61
61static void split_uninit(AVFilterContext *ctx)62static av_cold void split_uninit(AVFilterContext *ctx)
62{63{
63 int i;64 int i;
64 65
libavfilter/src_movie.c+2−0
@@ -30,6 +30,8 @@ · 29 unmodified lines
30/* #define DEBUG */30/* #define DEBUG */
31 31
32#include <float.h>32#include <float.h>
33
34#include "libavutil/attributes.h"
33#include "libavutil/avstring.h"35#include "libavutil/avstring.h"
34#include "libavutil/avassert.h"36#include "libavutil/avassert.h"
35#include "libavutil/opt.h"37#include "libavutil/opt.h"
libavfilter/vf_hqdn3d.c+3−2
@@ -29,6 +29,7 @@ · 28 unmodified lines
29#include <float.h>29#include <float.h>
30 30
31#include "config.h"31#include "config.h"
32#include "libavutil/attributes.h"
32#include "libavutil/common.h"33#include "libavutil/common.h"
33#include "libavutil/pixdesc.h"34#include "libavutil/pixdesc.h"
34#include "libavutil/intreadwrite.h"35#include "libavutil/intreadwrite.h"
@@ -181,7 +182,7 @@ static int16_t *precalc_coefs(double dist25, int depth) · 146 unmodified lines
181#define PARAM2_DEFAULT 3.0182#define PARAM2_DEFAULT 3.0
182#define PARAM3_DEFAULT 6.0183#define PARAM3_DEFAULT 6.0
183 184
184static int init(AVFilterContext *ctx)185static av_cold int init(AVFilterContext *ctx)
185{186{
186 HQDN3DContext *hqdn3d = ctx->priv;187 HQDN3DContext *hqdn3d = ctx->priv;
187 188
@@ -201,7 +202,7 @@ static int init(AVFilterContext *ctx) · 13 unmodified lines
201 return 0;202 return 0;
202}203}
203 204
204static void uninit(AVFilterContext *ctx)205static av_cold void uninit(AVFilterContext *ctx)
205{206{
206 HQDN3DContext *hqdn3d = ctx->priv;207 HQDN3DContext *hqdn3d = ctx->priv;
207 208
libavfilter/vf_lut.c+4−3
@@ -24,6 +24,7 @@ · 23 unmodified lines
24 * value, and apply it to input video.24 * value, and apply it to input video.
25 */25 */
26 26
27#include "libavutil/attributes.h"
27#include "libavutil/common.h"28#include "libavutil/common.h"
28#include "libavutil/eval.h"29#include "libavutil/eval.h"
29#include "libavutil/opt.h"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#define lutyuv_options options372#define lutyuv_options options
372AVFILTER_DEFINE_CLASS(lutyuv);373AVFILTER_DEFINE_CLASS(lutyuv);
373 374
374static int lutyuv_init(AVFilterContext *ctx)375static av_cold int lutyuv_init(AVFilterContext *ctx)
375{376{
376 LutContext *lut = ctx->priv;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#define lutrgb_options options389#define lutrgb_options options
389AVFILTER_DEFINE_CLASS(lutrgb);390AVFILTER_DEFINE_CLASS(lutrgb);
390 391
391static int lutrgb_init(AVFilterContext *ctx)392static av_cold int lutrgb_init(AVFilterContext *ctx)
392{393{
393 LutContext *lut = ctx->priv;394 LutContext *lut = ctx->priv;
394 395
@@ -409,7 +410,7 @@ static const AVOption negate_options[] = { · 14 unmodified lines
409 410
410AVFILTER_DEFINE_CLASS(negate);411AVFILTER_DEFINE_CLASS(negate);
411 412
412static int negate_init(AVFilterContext *ctx)413static av_cold int negate_init(AVFilterContext *ctx)
413{414{
414 LutContext *lut = ctx->priv;415 LutContext *lut = ctx->priv;
415 int i;416 int i;
libavfilter/x86/af_volume_init.c+2−1
@@ -17,6 +17,7 @@ · 16 unmodified lines
17 */17 */
18 18
19#include "config.h"19#include "config.h"
20#include "libavutil/attributes.h"
20#include "libavutil/cpu.h"21#include "libavutil/cpu.h"
21#include "libavutil/samplefmt.h"22#include "libavutil/samplefmt.h"
22#include "libavutil/x86/cpu.h"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
32void ff_scale_samples_s32_avx(uint8_t *dst, const uint8_t *src, int len,33void ff_scale_samples_s32_avx(uint8_t *dst, const uint8_t *src, int len,
33 int volume);34 int volume);
34 35
35void ff_volume_init_x86(VolumeContext *vol)36av_cold void ff_volume_init_x86(VolumeContext *vol)
36{37{
37 int mm_flags = av_get_cpu_flags();38 int mm_flags = av_get_cpu_flags();
38 enum AVSampleFormat sample_fmt = av_get_packed_sample_fmt(vol->sample_fmt);39 enum AVSampleFormat sample_fmt = av_get_packed_sample_fmt(vol->sample_fmt);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t