OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
69a283e
)
swscale/utils: remove useless ()
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 15 Dec 2013 13:10:02 +0000
(14:10 +0100)
committer
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Mon, 16 Dec 2013 01:21:35 +0000
(
02:21
+0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
554e913fd7acc9da02ddac2c5ce9487f7f633c92
)
libswscale/utils.c
patch
|
blob
|
history
diff --git
a/libswscale/utils.c
b/libswscale/utils.c
index
69087dc
..
2cad0c8
100644
(file)
--- a/
libswscale/utils.c
+++ b/
libswscale/utils.c
@@
-1331,8
+1331,8
@@
av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
dst_stride <<= 1;
if (INLINE_MMXEXT(cpu_flags) && c->srcBpc == 8 && c->dstBpc <= 14) {
- c->canMMXEXTBeUsed =
(
dstW >= srcW && (dstW & 31) == 0 &&
-
(srcW & 15) == 0) ? 1 :
0;
+ c->canMMXEXTBeUsed = dstW >= srcW && (dstW & 31) == 0 &&
+
(srcW & 15) ==
0;
if (!c->canMMXEXTBeUsed && dstW >= srcW && (srcW & 15) == 0
&& (flags & SWS_FAST_BILINEAR)) {