diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 11:42:18 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 11:42:18 +0200 |
commit | a8ff830b79d05b1c03ae7e2551ff7142e0845cec (patch) | |
tree | 35911c95ac168e57e97871aa0524a43a2b04268e /libavfilter/vf_lut.c | |
parent | 0aa095483d194c0cfe6acc6dd4c72e545312676e (diff) | |
parent | 093804a93cc5da3f95f98265a5df116912443cec (diff) | |
download | ffmpeg-a8ff830b79d05b1c03ae7e2551ff7142e0845cec.tar.gz |
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>
Diffstat (limited to 'libavfilter/vf_lut.c')
-rw-r--r-- | libavfilter/vf_lut.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c index 010f58af28..c69efed90d 100644 --- a/libavfilter/vf_lut.c +++ b/libavfilter/vf_lut.c @@ -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; |