diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2010-09-27 21:48:06 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-09-27 21:48:06 +0000 |
| commit | 236f79480b15df8996455168742d141bbf578df2 (patch) | |
| tree | 13b2bf4352f552fdb6d6ca4d67fcff89cb879512 /libavfilter/vf_yadif.c | |
| parent | 2a5db1aa588eb157c35e44ca2a76a1184aa5bcf4 (diff) | |
| download | ffmpeg-236f79480b15df8996455168742d141bbf578df2.tar.gz | |
merge #if with if()
Originally committed as revision 25233 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter/vf_yadif.c')
| -rw-r--r-- | libavfilter/vf_yadif.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c index 86b97444cd..9e700f9d5b 100644 --- a/libavfilter/vf_yadif.c +++ b/libavfilter/vf_yadif.c @@ -294,10 +294,8 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) if (args) sscanf(args, "%d:%d", &yadif->mode, &yadif->parity); yadif->filter_line = filter_line_c; -#if HAVE_MMX - if (cpu_flags & AV_CPU_FLAG_MMX) + if (HAVE_MMX && cpu_flags & AV_CPU_FLAG_MMX) yadif->filter_line = ff_yadif_filter_line_mmx; -#endif av_log(ctx, AV_LOG_INFO, "mode:%d parity:%d\n", yadif->mode, yadif->parity); |