projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2a5db1a
)
merge #if with if()
author
Aurelien Jacobs
<aurel@gnuage.org>
Mon, 27 Sep 2010 21:48:06 +0000
(21:48 +0000)
committer
Aurelien Jacobs
<aurel@gnuage.org>
Mon, 27 Sep 2010 21:48:06 +0000
(21:48 +0000)
Originally committed as revision 25233 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavfilter/vf_yadif.c
patch
|
blob
|
history
diff --git
a/libavfilter/vf_yadif.c
b/libavfilter/vf_yadif.c
index
86b9744
..
9e700f9
100644
(file)
--- 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);