summaryrefslogtreecommitdiff
path: root/v4l2-apps/lib/libv4l/libv4lconvert/jidctflt.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-08-29 18:40:09 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-08-29 18:40:09 -0300
commit3308516a2fe5ca58a64f65fe813de98f3637d653 (patch)
tree0974c897287c884849110e16586c0f34d8f47957 /v4l2-apps/lib/libv4l/libv4lconvert/jidctflt.c
parenta9bf92eb33a4ad79b8093c90379fb9d7519f1c88 (diff)
parente17ae483fc1526567d78cf551747362614aaae95 (diff)
downloadmediapointer-dvb-s2-3308516a2fe5ca58a64f65fe813de98f3637d653.tar.gz
mediapointer-dvb-s2-3308516a2fe5ca58a64f65fe813de98f3637d653.tar.bz2
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l2-apps/lib/libv4l/libv4lconvert/jidctflt.c')
-rw-r--r--v4l2-apps/lib/libv4l/libv4lconvert/jidctflt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/v4l2-apps/lib/libv4l/libv4lconvert/jidctflt.c b/v4l2-apps/lib/libv4l/libv4lconvert/jidctflt.c
index ba70309c9..532abc7ea 100644
--- a/v4l2-apps/lib/libv4l/libv4lconvert/jidctflt.c
+++ b/v4l2-apps/lib/libv4l/libv4lconvert/jidctflt.c
@@ -80,7 +80,7 @@
#define DEQUANTIZE(coef,quantval) (((FAST_FLOAT) (coef)) * (quantval))
-#if defined(__GNUC__) && (defined(__i686__)) // || defined(__x86_64__))
+#if defined(__GNUC__) && (defined(__i686__) || defined(__x86_64__))
static inline unsigned char descale_and_clamp(int x, int shift)
{
@@ -92,7 +92,7 @@ static inline unsigned char descale_and_clamp(int x, int shift)
"\tcmpl %4,%1\n"
"\tcmovg %4,%1\n"
: "=r"(x)
- : "0"(x), "Ic"((unsigned char)shift), "ir"(1UL<<(shift-1)), "r" (0xff), "r" (0)
+ : "0"(x), "Ic"((unsigned char)shift), "ir"(1U<<(shift-1)), "r" (0xff), "r" (0)
);
return x;
}