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>
This commit is contained in:
@@ -25,6 +25,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "libavutil/attributes.h"
|
||||
#include "libavutil/internal.h"
|
||||
#include "libavutil/mem.h"
|
||||
#include "libavutil/opt.h"
|
||||
@@ -39,7 +40,7 @@ typedef struct SplitContext {
|
||||
int nb_outputs;
|
||||
} SplitContext;
|
||||
|
||||
static int split_init(AVFilterContext *ctx)
|
||||
static av_cold int split_init(AVFilterContext *ctx)
|
||||
{
|
||||
SplitContext *s = ctx->priv;
|
||||
int i;
|
||||
@@ -58,7 +59,7 @@ static int split_init(AVFilterContext *ctx)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void split_uninit(AVFilterContext *ctx)
|
||||
static av_cold void split_uninit(AVFilterContext *ctx)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
Reference in New Issue
Block a user