diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-29 14:46:21 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-29 14:46:21 -0300 |
| commit | 8030ee67bdce5ce3725581d715f9451b950d45da (patch) | |
| tree | 81af4c86341760d746e90ea43778181aa20f2f7b /v4l2-apps/lib/libv4l/libv4lconvert/jidctflt.c | |
| parent | 19050620d7676a007898ae8404ad4edc757f9d2f (diff) | |
| parent | b29c49d48ca0db5d5e8e98f1622be4d0311656c4 (diff) | |
| download | mediapointer-dvb-s2-8030ee67bdce5ce3725581d715f9451b950d45da.tar.gz mediapointer-dvb-s2-8030ee67bdce5ce3725581d715f9451b950d45da.tar.bz2 | |
merge: http://linuxtv.org/hg/~hgoede/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.c | 4 |
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; } |