diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 13:42:18 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 13:42:18 +0400 |
| commit | a8ff830b79d05b1c03ae7e2551ff7142e0845cec (patch) | |
| tree | 35911c95ac168e57e97871aa0524a43a2b04268e /libavfilter/af_ashowinfo.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_ashowinfo.c')
| -rw-r--r-- | libavfilter/af_ashowinfo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c index f53584ec56..7770c276c9 100644 --- a/libavfilter/af_ashowinfo.c +++ b/libavfilter/af_ashowinfo.c @@ -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); |