diff options
| author | Mike Melanson <mike@multimedia.cx> | 2005-10-29 23:57:06 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2005-10-29 23:57:06 +0000 |
| commit | 03ac29c63fd3d5019c67b3662669b1c443896f0b (patch) | |
| tree | 00db769b2943fce16b9967591652d2c0724be168 /src/libfaad/bits.h | |
| parent | c7976c4d0d8d02fa18bc9fd82bafe99e333e2a53 (diff) | |
| download | xine-lib-03ac29c63fd3d5019c67b3662669b1c443896f0b.tar.gz xine-lib-03ac29c63fd3d5019c67b3662669b1c443896f0b.tar.bz2 | |
update libfaad2 to CVS snapshot 2004-09-15
CVS patchset: 7777
CVS date: 2005/10/29 23:57:06
Diffstat (limited to 'src/libfaad/bits.h')
| -rw-r--r-- | src/libfaad/bits.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/libfaad/bits.h b/src/libfaad/bits.h index c17e4931e..a3c5f3572 100644 --- a/src/libfaad/bits.h +++ b/src/libfaad/bits.h @@ -1,19 +1,19 @@ /* ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding ** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com -** +** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation; either version 2 of the License, or ** (at your option) any later version. -** +** ** This program is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. -** +** ** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software +** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ** ** Any non-GPL usage of this software or parts of this software is strictly @@ -22,7 +22,7 @@ ** Commercial non-GPL licensing of this software is possible. ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** -** $Id: bits.h,v 1.9 2004/12/03 01:15:29 tmattern Exp $ +** $Id: bits.h,v 1.10 2005/10/29 23:57:06 tmmm Exp $ **/ #ifndef __BITS_H__ @@ -56,9 +56,9 @@ typedef struct _bitfile } bitfile; -#if defined(_MSC_VER) +#if defined (_WIN32) && !defined(_WIN32_WCE) && !defined(__MINGW32__) #define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax -#elif defined(LINUX) || defined(DJGPP) || defined (__MINGW32__) || defined (__CYGWIN__) +#elif defined(LINUX) || defined(DJGPP) || defined(__MINGW32__) #define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) ) #else #define BSWAP(a) \ @@ -317,7 +317,7 @@ typedef struct /* bit input */ uint32_t bufa; uint32_t bufb; - int8_t len; + int8_t len; } bits_t; @@ -331,7 +331,7 @@ static INLINE uint32_t showbits_hcr(bits_t *ld, uint8_t bits) if (ld->len >= bits) return ((ld->bufa >> (ld->len - bits)) & (0xFFFFFFFF >> (32 - bits))); else - return ((ld->bufa << (bits - ld->len)) & (0xFFFFFFFF >> (32 - bits))); + return ((ld->bufa << (bits - ld->len)) & (0xFFFFFFFF >> (32 - bits))); } else { if ((ld->len - bits) < 32) { |