virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avfilter/vsrc_life: Fix mix of declarations and statements

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-04-09 11:05:43 +02:00
parent df4fca2163
commit 0773f67395
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/vsrc_life.c
View File

@@ -415,6 +415,8 @@ static int query_formats(AVFilterContext *ctx)
{ {
LifeContext *life = ctx->priv; LifeContext *life = ctx->priv;
enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_NONE, AV_PIX_FMT_NONE }; enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_NONE, AV_PIX_FMT_NONE };
AVFilterFormats *fmts_list;
if (life->mold || memcmp(life-> life_color, "\xff\xff\xff", 3) if (life->mold || memcmp(life-> life_color, "\xff\xff\xff", 3)
|| memcmp(life->death_color, "\x00\x00\x00", 3)) { || memcmp(life->death_color, "\x00\x00\x00", 3)) {
pix_fmts[0] = AV_PIX_FMT_RGB24; pix_fmts[0] = AV_PIX_FMT_RGB24;
@@ -424,7 +426,7 @@ static int query_formats(AVFilterContext *ctx)
life->draw = fill_picture_monoblack; life->draw = fill_picture_monoblack;
} }
AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); fmts_list = ff_make_format_list(pix_fmts);
if (!fmts_list) if (!fmts_list)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ff_set_common_formats(ctx, fmts_list); ff_set_common_formats(ctx, fmts_list);