generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '093804a93cc5da3f95f98265a5df116912443cec'

Browse Source 
* 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:
Michael Niedermayer
2013-05-05 11:42:18 +02:00
parent 0aa095483d 093804a93c
commit a8ff830b79
11 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/af_join.c
View File

@@ -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;