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/af_join.c | |
| parent | 0aa095483d194c0cfe6acc6dd4c72e545312676e (diff) | |
| parent | 093804a93cc5da3f95f98265a5df116912443cec (diff) | |
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/af_join.c')
| -rw-r--r-- | libavfilter/af_join.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c index cea448b457..b8e9e85c4f 100644 --- a/libavfilter/af_join.c +++ b/libavfilter/af_join.c @@ -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; |