ref: 9fb0bb21466d559ade746a380cb1454cf86c2a00
parent: 00626046473379e2be1594539504f8c43761ba61
author: menno <menno>
date: Thu Mar 11 08:32:39 EST 2004
fixes for mingw compiler
--- a/libfaad/bits.h
+++ b/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.37 2004/02/26 09:29:26 menno Exp $
+** $Id: bits.h,v 1.38 2004/03/11 13:32:39 menno Exp $
**/
#ifndef __BITS_H__
@@ -56,9 +56,9 @@
} bitfile;
-#if defined (_WIN32) && !defined(_WIN32_WCE)
+#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)
+#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 @@
/* bit input */
uint32_t bufa;
uint32_t bufb;
- int8_t len;
+ int8_t len;
} bits_t;
@@ -331,7 +331,7 @@
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)
{--- a/libfaad/common.h
+++ b/libfaad/common.h
@@ -22,7 +22,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
**
-** $Id: common.h,v 1.53 2004/03/10 19:45:40 menno Exp $
+** $Id: common.h,v 1.54 2004/03/11 13:32:39 menno Exp $
**/
#ifndef __COMMON_H__
@@ -145,7 +145,7 @@
/* END COMPILE TIME DEFINITIONS */
-#if defined(_WIN32)
+#if defined(_WIN32) && !defined(__MINGW32__)
typedef unsigned __int64 uint64_t;