diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-29 18:35:43 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-29 18:35:43 -0300 |
commit | e8beadde87198bcede646d9a96042f017d115d7b (patch) | |
tree | 49621d71d57cff7daacae777f234f62e00f6dd5a /v4l2-apps/lib/libv4l/libv4lconvert/jidctflt.c | |
parent | b411ce2ea34831c61d02f0ce0278f525abd2e3c3 (diff) | |
parent | fcf7b1133c054c011cd1cb75ac466333f61812f8 (diff) | |
download | mediapointer-dvb-s2-e8beadde87198bcede646d9a96042f017d115d7b.tar.gz mediapointer-dvb-s2-e8beadde87198bcede646d9a96042f017d115d7b.tar.bz2 |
merge? http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-empress
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Priority: normal
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; } |