Update to 0.98.13:

Additional patch from dillo@:
Fix display and sync on sound.  Ignore NoWaiting and the rest for now.

Changes since 0.98.12:
	SDL:  Fixed button configuration when using joystick hats.  Thanks to
	ShaolinMan for pointing out the code errors.

	Readded checks in ines.c for some common bad dumps and non-working hacked
	games.

	Sprite hit emulation is more precise(as it was in 0.97.5).

	Fixed mapper 185 emulation to work properly with the Japanese
	version of "Spy vs Spy", and hopefully with the GOOD dump
	of Banana(I don't think one exists).

	Added per-game hacks for Shougi Meikan '92 and Shougi Meikan '93.

	Fixed a bug in SetupCartMirroring() that could cause some games to have corrupted
	mirroring if loaded in a certain order.  This was a rather major, long-standing
	bug. :/

	Added many iNES header corrections.

	Fixed emulation of the "ISB" and "DCP" invalid opcodes.

	Optimized the PPU background drawing code with inline assembly.  Older/some(?) versions
	of gcc may produce bad code(from previous experience with inline
	assembly in gcc), but 3.4.1 seems to do ok.

	Optimized some of the low-quality sound emulation code.

	Added a command-line option to the configure script to enable the FCE Ultra
	debugger(disabled by default).  It reduces executable size, and may increase speed
	of execution slightly.

	In unix-netplay.c, replaced the ioctl() on a socket to read the number of bytes available to read
	with a select().  I've also added some "BEOS" #ifdefs.  I don't know if they will
	work properly.

	Replaced archaic include of "malloc.h" in unix-netplay.c with "stdlib.h".
	Also in unix-netplay.c, I've added:

		#ifndef SOL_TCP
		#define SOL_TCP IPPROTO_TCP
		#endif

	Fixed a bug in sdl-sound.c that would prevent FCE Ultra from being compiled
	on certain platforms(Mac OS X).

	Fixed variable declarations in the following files to be compatible
	with C compilers that don't adhere to C99(or was it C98...):
		movie.c
		drivers/sexyal/convertgen.c and drivers/sexyal/convert.inc
		drivers/pc/unix-netplay.c

8 files changed, 119 insertions, 6467 deletions

diff --git a/emulators/fceu/Makefile b/emulators/fceu/Makefile
index 504e4f7958d..ee5e589fbc2 100644
--- a/emulators/fceu/Makefile
+++ b/emulators/fceu/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/10/30 11:47:56 wiz Exp $
 #
 
-DISTNAME=		fceu-0.98.12.src
+DISTNAME=		fceu-0.98.13.src
 PKGNAME=		${DISTNAME:S/.src//}
-PKGREVISION=		1
 CATEGORIES=		emulators
-MASTER_SITES=		http://fceultra.sourceforge.net/releases/
+MASTER_SITES=		http://pdaxrom.theinternet.nl/fceu/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		wiz@NetBSD.org
-HOMEPAGE=		http://fceultra.sourceforge.net/
+HOMEPAGE=		http://pdaxrom.theinternet.nl/fceu/
 COMMENT=		Portable NES and Famicom emulator
 
 WRKSRC=			${WRKDIR}/fceu
diff --git a/emulators/fceu/distinfo b/emulators/fceu/distinfo
index 540ca42237c..810e439003d 100644
--- a/emulators/fceu/distinfo
+++ b/emulators/fceu/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 18:49:18 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/10/30 11:47:56 wiz Exp $
 
-SHA1 (fceu-0.98.12.src.tar.bz2) = 713faaad9f7d4b5e8dd1cb8a172e2f1ced85c1ec
-RMD160 (fceu-0.98.12.src.tar.bz2) = e405a459196d2e5e9d630c8699157ec4df0f0210
-Size (fceu-0.98.12.src.tar.bz2) = 559571 bytes
-SHA1 (patch-aa) = df9e098102d4c22c2699d5c5bdec79d72b8bac0c
-SHA1 (patch-ab) = 593c40bfe03e8ae8835113972a58a1cf46e882a9
+SHA1 (fceu-0.98.13.src.tar.bz2) = fed37a9858aa8b149472f964b2ca652168e9f29a
+RMD160 (fceu-0.98.13.src.tar.bz2) = fc736006ed1e9aa564de817622ed575f246bad48
+Size (fceu-0.98.13.src.tar.bz2) = 570842 bytes
+SHA1 (patch-aa) = 31ce24167b8f76df2961ce902d42f45b5278e451
 SHA1 (patch-ac) = 8a5297b11484c6eaf5d70a391bb486ff58475f35
-SHA1 (patch-ad) = 2a253539f9103b75a09f31d51427e8849a3b0249
-SHA1 (patch-ae) = d088b473376460ce29b17abd5dc4521513c55057
+SHA1 (patch-af) = a2b55359d65c60ecb7e7d79390ef872873c0eba1
+SHA1 (patch-ah) = cc48e36406b6d9e4cf88179510824135507aa6f9
diff --git a/emulators/fceu/patches/patch-aa b/emulators/fceu/patches/patch-aa
index 15684a58a76..4c68b470316 100644
--- a/emulators/fceu/patches/patch-aa
+++ b/emulators/fceu/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.2 2004/07/26 18:00:17 dillo Exp $
+$NetBSD: patch-aa,v 1.3 2005/10/30 11:47:56 wiz Exp $
 
 Make default keys match documentation.
 Also, add settings for joystick.
 
---- src/drivers/pc/input.c.orig	2004-05-17 01:48:26.000000000 +0200
+--- src/drivers/pc/input.c.orig	2004-09-11 10:04:33.000000000 +0200
 +++ src/drivers/pc/input.c
-@@ -278,6 +278,10 @@ static void KeyboardCommands(void)
+@@ -276,6 +276,10 @@ static void KeyboardCommands(void)
  
  #define MK(x)   {{BUTTC_KEYBOARD},{0},{MKK(x)},1}
  #define MK2(x1,x2)	{{BUTTC_KEYBOARD},{0},{MKK(x1),MKK(x2)},2}
@@ -16,13 +16,13 @@ Also, add settings for joystick.
  
  #define MKZ()   {{0},{0},{0},0}
  
-@@ -286,8 +290,13 @@ static void KeyboardCommands(void)
+@@ -284,8 +288,13 @@ static void KeyboardCommands(void)
  ButtConfig GamePadConfig[4][10]={
          /* Gamepad 1 */
          { 
 -	 MK(KP3), MK(KP2), MK(TAB), MK(ENTER), MK(W),MK(Z),
 -                MK(A), MK(S), MKZ(), MKZ()
-+	 MKJB(LEFTALT, 0), MKJB(LEFTCONTROL, 1), MKJB(TAB, 5), MKJB(ENTER, 7),
++	 MKJB(LEFTALT, 2), MKJB(LEFTCONTROL, 0), MKJB(TAB, 5), MKJB(ENTER, 7),
 +	 MKJA(CURSORUP, 1, 1), MKJA(CURSORDOWN, 1, 0),
 +	 MKJA(CURSORLEFT, 0, 1), MKJA(CURSORRIGHT, 0, 0), MKZ(), MKZ()
 +#if 0
diff --git a/emulators/fceu/patches/patch-ab b/emulators/fceu/patches/patch-ab
deleted file mode 100644
index 6b420c9e595..00000000000
--- a/emulators/fceu/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/07/24 01:11:41 kristerw Exp $
-
-SOL_TCP is 6, the same as IPPROTO_TCP and ISOPROTO_TCP on NetBSD.
-
---- src/drivers/pc/unix-netplay.c.orig	Mon May 17 07:28:06 2004
-+++ src/drivers/pc/unix-netplay.c	Sat Jul 24 03:01:36 2004
-@@ -76,6 +76,7 @@
-  unsigned long hadr;
-  int TSocket;
-  int netdivisor;
-+ int tcpopt = 1;
-   
-  if(!netplayhost) return(0);
- 
-@@ -85,8 +86,7 @@
-   FCEUD_NetworkClose();
-   return(0);
-  }
-- int tcpopt = 1;  
-- if(setsockopt(TSocket, SOL_TCP, TCP_NODELAY, &tcpopt, sizeof(int)))
-+ if(setsockopt(TSocket, 6, TCP_NODELAY, &tcpopt, sizeof(int)))
-   puts("Nodelay fail");
- 
-  memset(&sockin,0,sizeof(sockin));
diff --git a/emulators/fceu/patches/patch-ad b/emulators/fceu/patches/patch-ad
deleted file mode 100644
index 76ba55016df..00000000000
--- a/emulators/fceu/patches/patch-ad
+++ /dev/null
@@ -1,6404 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/07/24 01:11:41 kristerw Exp $
-
---- src/drivers/sexyal/convert.inc.orig	Mon Apr 19 07:27:01 2004
-+++ src/drivers/sexyal/convert.inc	Sat Jul 24 03:00:04 2004
-@@ -133,9 +133,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- tmp = (tmp+tmp2)>>1;
-  *dest=tmp;
-@@ -146,9 +147,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp);
- tmp = (tmp+tmp2)>>1;
-@@ -163,10 +165,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
- tmp = (tmp+tmp2)>>1;
-@@ -178,10 +181,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
- FLIP32(tmp);
-@@ -200,9 +204,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  *dest=tmp;
-  dest++;
-@@ -214,9 +219,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp);
- FLIP32(tmp2);
-@@ -233,10 +239,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  *dest=tmp;
-@@ -249,10 +256,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
- FLIP32(tmp);
-@@ -405,9 +413,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=128;
-  tmp2+=128;
-@@ -420,9 +429,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=128;
-  tmp2+=128;
-@@ -439,10 +449,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=128;
-@@ -456,10 +467,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=128;
-@@ -480,9 +492,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=128;
-  tmp2+=128;
-@@ -496,9 +509,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=128;
-  tmp2+=128;
-@@ -517,10 +531,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=128;
-@@ -535,10 +550,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=128;
-@@ -693,9 +709,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -708,9 +725,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -727,10 +745,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 8;
-@@ -744,10 +763,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 8;
-@@ -768,9 +788,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -784,9 +805,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -805,10 +827,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 8;
-@@ -823,10 +846,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 8;
-@@ -989,9 +1013,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=128;
-  tmp <<= 8;
-@@ -1006,9 +1031,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=128;
-  tmp <<= 8;
-@@ -1027,10 +1053,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=128;
-@@ -1046,10 +1073,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=128;
-@@ -1072,9 +1100,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=128;
-  tmp <<= 8;
-@@ -1090,9 +1119,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=128;
-  tmp <<= 8;
-@@ -1113,10 +1143,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=128;
-@@ -1133,10 +1164,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=128;
-@@ -1293,9 +1325,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -1308,9 +1341,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -1327,10 +1361,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 8;
-@@ -1344,10 +1379,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 8;
-@@ -1368,9 +1404,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -1384,9 +1421,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -1405,10 +1443,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 8;
-@@ -1423,10 +1462,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 8;
-@@ -1589,9 +1629,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=128;
-  tmp <<= 8;
-@@ -1606,9 +1647,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=128;
-  tmp <<= 8;
-@@ -1627,10 +1669,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=128;
-@@ -1646,10 +1689,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=128;
-@@ -1672,9 +1716,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=128;
-  tmp <<= 8;
-@@ -1690,9 +1735,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=128;
-  tmp <<= 8;
-@@ -1713,10 +1759,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=128;
-@@ -1733,10 +1780,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=128;
-@@ -1893,9 +1941,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 16;
-  tmp2 <<= 16;
-@@ -1908,9 +1957,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 16;
-  tmp2 <<= 16;
-@@ -1927,10 +1977,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 16;
-@@ -1944,10 +1995,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 16;
-@@ -1968,9 +2020,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 16;
-  tmp2 <<= 16;
-@@ -1984,9 +2037,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 16;
-  tmp2 <<= 16;
-@@ -2005,10 +2059,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 16;
-@@ -2023,10 +2078,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 16;
-@@ -2189,9 +2245,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=128;
-  tmp <<= 16;
-@@ -2206,9 +2263,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=128;
-  tmp <<= 16;
-@@ -2227,10 +2285,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=128;
-@@ -2246,10 +2305,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=128;
-@@ -2272,9 +2332,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=128;
-  tmp <<= 16;
-@@ -2290,9 +2351,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=128;
-  tmp <<= 16;
-@@ -2313,10 +2375,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=128;
-@@ -2333,10 +2396,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=128;
-@@ -2497,9 +2561,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=128;
-  tmp2-=128;
-@@ -2512,9 +2577,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=128;
-  tmp2-=128;
-@@ -2531,10 +2597,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=128;
-@@ -2548,10 +2615,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=128;
-@@ -2572,9 +2640,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=128;
-  tmp2-=128;
-@@ -2588,9 +2657,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=128;
-  tmp2-=128;
-@@ -2609,10 +2679,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=128;
-@@ -2627,10 +2698,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=128;
-@@ -2777,9 +2849,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- tmp = (tmp+tmp2)>>1;
-  *dest=tmp;
-@@ -2790,9 +2863,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp);
- tmp = (tmp+tmp2)>>1;
-@@ -2807,10 +2881,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
- tmp = (tmp+tmp2)>>1;
-@@ -2822,10 +2897,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
- FLIP32(tmp);
-@@ -2844,9 +2920,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  *dest=tmp;
-  dest++;
-@@ -2858,9 +2935,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp);
- FLIP32(tmp2);
-@@ -2877,10 +2955,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  *dest=tmp;
-@@ -2893,10 +2972,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
- FLIP32(tmp);
-@@ -3057,9 +3137,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=128;
-  tmp <<= 8;
-@@ -3074,9 +3155,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=128;
-  tmp <<= 8;
-@@ -3095,10 +3177,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=128;
-@@ -3114,10 +3197,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=128;
-@@ -3140,9 +3224,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=128;
-  tmp <<= 8;
-@@ -3158,9 +3243,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=128;
-  tmp <<= 8;
-@@ -3181,10 +3267,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=128;
-@@ -3201,10 +3288,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=128;
-@@ -3361,9 +3449,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -3376,9 +3465,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -3395,10 +3485,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 8;
-@@ -3412,10 +3503,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 8;
-@@ -3436,9 +3528,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -3452,9 +3545,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -3473,10 +3567,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 8;
-@@ -3491,10 +3586,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 8;
-@@ -3657,9 +3753,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=128;
-  tmp <<= 8;
-@@ -3674,9 +3771,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=128;
-  tmp <<= 8;
-@@ -3695,10 +3793,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=128;
-@@ -3714,10 +3813,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=128;
-@@ -3740,9 +3840,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=128;
-  tmp <<= 8;
-@@ -3758,9 +3859,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=128;
-  tmp <<= 8;
-@@ -3781,10 +3883,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=128;
-@@ -3801,10 +3904,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=128;
-@@ -3961,9 +4065,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -3976,9 +4081,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -3995,10 +4101,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 8;
-@@ -4012,10 +4119,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 8;
-@@ -4036,9 +4144,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -4052,9 +4161,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -4073,10 +4183,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 8;
-@@ -4091,10 +4202,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 8;
-@@ -4257,9 +4369,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=128;
-  tmp <<= 16;
-@@ -4274,9 +4387,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=128;
-  tmp <<= 16;
-@@ -4295,10 +4409,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=128;
-@@ -4314,10 +4429,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=128;
-@@ -4340,9 +4456,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=128;
-  tmp <<= 16;
-@@ -4358,9 +4475,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=128;
-  tmp <<= 16;
-@@ -4381,10 +4499,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=128;
-@@ -4401,10 +4520,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=128;
-@@ -4561,9 +4681,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 16;
-  tmp2 <<= 16;
-@@ -4576,9 +4697,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 16;
-  tmp2 <<= 16;
-@@ -4595,10 +4717,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 16;
-@@ -4612,10 +4735,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 16;
-@@ -4636,9 +4760,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 16;
-  tmp2 <<= 16;
-@@ -4652,9 +4777,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 16;
-  tmp2 <<= 16;
-@@ -4673,10 +4799,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 16;
-@@ -4691,10 +4818,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 16;
-@@ -4853,9 +4981,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -4868,9 +4997,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -4887,10 +5017,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp >>= 8;
-@@ -4904,10 +5035,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp >>= 8;
-@@ -4928,9 +5060,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -4944,9 +5077,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -4965,10 +5099,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp >>= 8;
-@@ -4983,10 +5118,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp >>= 8;
-@@ -5149,9 +5285,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp >>= 8;
-@@ -5166,9 +5303,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp >>= 8;
-@@ -5187,10 +5325,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp+=32768;
-@@ -5206,10 +5345,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp+=32768;
-@@ -5232,9 +5372,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp >>= 8;
-@@ -5250,9 +5391,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp >>= 8;
-@@ -5273,10 +5415,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp+=32768;
-@@ -5293,10 +5436,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp+=32768;
-@@ -5445,9 +5589,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- tmp = (tmp+tmp2)>>1;
-  *dest=tmp;
-@@ -5458,9 +5603,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp);
- tmp = (tmp+tmp2)>>1;
-@@ -5475,10 +5621,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
- tmp = (tmp+tmp2)>>1;
-@@ -5490,10 +5637,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
- FLIP16(tmp);
-@@ -5512,9 +5660,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  *dest=tmp;
-  dest++;
-@@ -5526,9 +5675,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp);
- FLIP16(tmp2);
-@@ -5545,10 +5695,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  *dest=tmp;
-@@ -5561,10 +5712,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
- FLIP16(tmp);
-@@ -5717,9 +5869,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp2+=32768;
-@@ -5732,9 +5885,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp2+=32768;
-@@ -5751,10 +5905,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp+=32768;
-@@ -5768,10 +5923,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp+=32768;
-@@ -5792,9 +5948,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp2+=32768;
-@@ -5808,9 +5965,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp2+=32768;
-@@ -5829,10 +5987,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp+=32768;
-@@ -5847,10 +6006,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp+=32768;
-@@ -6005,9 +6165,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 0;
-  tmp2 <<= 0;
-@@ -6020,9 +6181,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 0;
-  tmp2 <<= 0;
-@@ -6039,10 +6201,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp <<= 0;
-@@ -6056,10 +6219,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp <<= 0;
-@@ -6080,9 +6244,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 0;
-  tmp2 <<= 0;
-@@ -6096,9 +6261,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 0;
-  tmp2 <<= 0;
-@@ -6117,10 +6283,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp <<= 0;
-@@ -6135,10 +6302,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp <<= 0;
-@@ -6301,9 +6469,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp <<= 0;
-@@ -6318,9 +6487,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp <<= 0;
-@@ -6339,10 +6509,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp+=32768;
-@@ -6358,10 +6529,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp+=32768;
-@@ -6384,9 +6556,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp <<= 0;
-@@ -6402,9 +6575,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp <<= 0;
-@@ -6425,10 +6599,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp+=32768;
-@@ -6445,10 +6620,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp+=32768;
-@@ -6605,9 +6781,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -6620,9 +6797,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -6639,10 +6817,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp <<= 8;
-@@ -6656,10 +6835,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp <<= 8;
-@@ -6680,9 +6860,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -6696,9 +6877,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -6717,10 +6899,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp <<= 8;
-@@ -6735,10 +6918,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp <<= 8;
-@@ -6901,9 +7085,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp <<= 8;
-@@ -6918,9 +7103,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp <<= 8;
-@@ -6939,10 +7125,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp+=32768;
-@@ -6958,10 +7145,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp+=32768;
-@@ -6984,9 +7172,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp <<= 8;
-@@ -7002,9 +7191,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp <<= 8;
-@@ -7025,10 +7215,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp+=32768;
-@@ -7045,10 +7236,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp+=32768;
-@@ -7217,9 +7409,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp >>= 8;
-@@ -7234,9 +7427,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp >>= 8;
-@@ -7255,10 +7449,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp-=32768;
-@@ -7274,10 +7469,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp-=32768;
-@@ -7300,9 +7496,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp >>= 8;
-@@ -7318,9 +7515,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp >>= 8;
-@@ -7341,10 +7539,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp-=32768;
-@@ -7361,10 +7560,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp-=32768;
-@@ -7521,9 +7721,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -7536,9 +7737,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -7555,10 +7757,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp >>= 8;
-@@ -7572,10 +7775,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp >>= 8;
-@@ -7596,9 +7800,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -7612,9 +7817,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -7633,10 +7839,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp >>= 8;
-@@ -7651,10 +7858,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp >>= 8;
-@@ -7809,9 +8017,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp2-=32768;
-@@ -7824,9 +8033,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp2-=32768;
-@@ -7843,10 +8053,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp-=32768;
-@@ -7860,10 +8071,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp-=32768;
-@@ -7884,9 +8096,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp2-=32768;
-@@ -7900,9 +8113,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp2-=32768;
-@@ -7921,10 +8135,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp-=32768;
-@@ -7939,10 +8154,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp-=32768;
-@@ -8089,9 +8305,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- tmp = (tmp+tmp2)>>1;
-  *dest=tmp;
-@@ -8102,9 +8319,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp);
- tmp = (tmp+tmp2)>>1;
-@@ -8119,10 +8337,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
- tmp = (tmp+tmp2)>>1;
-@@ -8134,10 +8353,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
- FLIP16(tmp);
-@@ -8156,9 +8376,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  *dest=tmp;
-  dest++;
-@@ -8170,9 +8391,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp);
- FLIP16(tmp2);
-@@ -8189,10 +8411,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  *dest=tmp;
-@@ -8205,10 +8428,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
- FLIP16(tmp);
-@@ -8369,9 +8593,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp <<= 0;
-@@ -8386,9 +8611,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp <<= 0;
-@@ -8407,10 +8633,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp-=32768;
-@@ -8426,10 +8653,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp-=32768;
-@@ -8452,9 +8680,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp <<= 0;
-@@ -8470,9 +8699,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp <<= 0;
-@@ -8493,10 +8723,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp-=32768;
-@@ -8513,10 +8744,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp-=32768;
-@@ -8673,9 +8905,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 0;
-  tmp2 <<= 0;
-@@ -8688,9 +8921,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 0;
-  tmp2 <<= 0;
-@@ -8707,10 +8941,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp <<= 0;
-@@ -8724,10 +8959,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp <<= 0;
-@@ -8748,9 +8984,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 0;
-  tmp2 <<= 0;
-@@ -8764,9 +9001,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 0;
-  tmp2 <<= 0;
-@@ -8785,10 +9023,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp <<= 0;
-@@ -8803,10 +9042,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp <<= 0;
-@@ -8969,9 +9209,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp <<= 8;
-@@ -8986,9 +9227,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp <<= 8;
-@@ -9007,10 +9249,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp-=32768;
-@@ -9026,10 +9269,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp-=32768;
-@@ -9052,9 +9296,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp <<= 8;
-@@ -9070,9 +9315,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp <<= 8;
-@@ -9093,10 +9339,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp-=32768;
-@@ -9113,10 +9360,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp-=32768;
-@@ -9273,9 +9521,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -9288,9 +9537,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -9307,10 +9557,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp <<= 8;
-@@ -9324,10 +9575,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp <<= 8;
-@@ -9348,9 +9600,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -9364,9 +9617,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -9385,10 +9639,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp <<= 8;
-@@ -9403,10 +9658,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP16(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP16(tmp2);
-  tmp <<= 8;
-@@ -9565,9 +9821,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -9580,9 +9837,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -9599,10 +9857,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 8;
-@@ -9616,10 +9875,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 8;
-@@ -9640,9 +9900,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -9656,9 +9917,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -9677,10 +9939,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 8;
-@@ -9695,10 +9958,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 8;
-@@ -9861,9 +10125,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp >>= 8;
-@@ -9878,9 +10143,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp >>= 8;
-@@ -9899,10 +10165,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=32768;
-@@ -9918,10 +10185,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=32768;
-@@ -9944,9 +10212,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp >>= 8;
-@@ -9962,9 +10231,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp >>= 8;
-@@ -9985,10 +10255,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=32768;
-@@ -10005,10 +10276,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=32768;
-@@ -10165,9 +10437,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 0;
-  tmp2 <<= 0;
-@@ -10180,9 +10453,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 0;
-  tmp2 <<= 0;
-@@ -10199,10 +10473,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 0;
-@@ -10216,10 +10491,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 0;
-@@ -10240,9 +10516,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 0;
-  tmp2 <<= 0;
-@@ -10256,9 +10533,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 0;
-  tmp2 <<= 0;
-@@ -10277,10 +10555,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 0;
-@@ -10295,10 +10574,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 0;
-@@ -10461,9 +10741,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp <<= 0;
-@@ -10478,9 +10759,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp <<= 0;
-@@ -10499,10 +10781,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=32768;
-@@ -10518,10 +10801,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=32768;
-@@ -10544,9 +10828,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp <<= 0;
-@@ -10562,9 +10847,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp <<= 0;
-@@ -10585,10 +10871,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=32768;
-@@ -10605,10 +10892,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=32768;
-@@ -10757,9 +11045,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- tmp = (tmp+tmp2)>>1;
-  *dest=tmp;
-@@ -10770,9 +11059,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp);
- tmp = (tmp+tmp2)>>1;
-@@ -10787,10 +11077,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
- tmp = (tmp+tmp2)>>1;
-@@ -10802,10 +11093,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
- FLIP32(tmp);
-@@ -10824,9 +11116,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  *dest=tmp;
-  dest++;
-@@ -10838,9 +11131,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp);
- FLIP32(tmp2);
-@@ -10857,10 +11151,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  *dest=tmp;
-@@ -10873,10 +11168,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
- FLIP32(tmp);
-@@ -11029,9 +11325,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp2+=32768;
-@@ -11044,9 +11341,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp2+=32768;
-@@ -11063,10 +11361,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=32768;
-@@ -11080,10 +11379,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=32768;
-@@ -11104,9 +11404,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp2+=32768;
-@@ -11120,9 +11421,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp2+=32768;
-@@ -11141,10 +11443,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=32768;
-@@ -11159,10 +11462,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=32768;
-@@ -11317,9 +11621,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -11332,9 +11637,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -11351,10 +11657,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 8;
-@@ -11368,10 +11675,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 8;
-@@ -11392,9 +11700,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -11408,9 +11717,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -11429,10 +11739,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 8;
-@@ -11447,10 +11758,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 8;
-@@ -11613,9 +11925,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp <<= 8;
-@@ -11630,9 +11943,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp <<= 8;
-@@ -11651,10 +11965,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=32768;
-@@ -11670,10 +11985,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=32768;
-@@ -11696,9 +12012,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp <<= 8;
-@@ -11714,9 +12031,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=32768;
-  tmp <<= 8;
-@@ -11737,10 +12055,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=32768;
-@@ -11757,10 +12076,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=32768;
-@@ -11929,9 +12249,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp >>= 8;
-@@ -11946,9 +12267,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp >>= 8;
-@@ -11967,10 +12289,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=32768;
-@@ -11986,10 +12309,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=32768;
-@@ -12012,9 +12336,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp >>= 8;
-@@ -12030,9 +12355,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp >>= 8;
-@@ -12053,10 +12379,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=32768;
-@@ -12073,10 +12400,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=32768;
-@@ -12233,9 +12561,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -12248,9 +12577,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -12267,10 +12597,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 8;
-@@ -12284,10 +12615,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 8;
-@@ -12308,9 +12640,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -12324,9 +12657,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -12345,10 +12679,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 8;
-@@ -12363,10 +12698,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 8;
-@@ -12529,9 +12865,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp <<= 0;
-@@ -12546,9 +12883,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp <<= 0;
-@@ -12567,10 +12905,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=32768;
-@@ -12586,10 +12925,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=32768;
-@@ -12612,9 +12952,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp <<= 0;
-@@ -12630,9 +12971,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp <<= 0;
-@@ -12653,10 +12995,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=32768;
-@@ -12673,10 +13016,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=32768;
-@@ -12833,9 +13177,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 0;
-  tmp2 <<= 0;
-@@ -12848,9 +13193,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 0;
-  tmp2 <<= 0;
-@@ -12867,10 +13213,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 0;
-@@ -12884,10 +13231,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 0;
-@@ -12908,9 +13256,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 0;
-  tmp2 <<= 0;
-@@ -12924,9 +13273,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 0;
-  tmp2 <<= 0;
-@@ -12945,10 +13295,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 0;
-@@ -12963,10 +13314,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 0;
-@@ -13121,9 +13473,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp2-=32768;
-@@ -13136,9 +13489,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp2-=32768;
-@@ -13155,10 +13509,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=32768;
-@@ -13172,10 +13527,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=32768;
-@@ -13196,9 +13552,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp2-=32768;
-@@ -13212,9 +13569,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp2-=32768;
-@@ -13233,10 +13591,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=32768;
-@@ -13251,10 +13610,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=32768;
-@@ -13401,9 +13761,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- tmp = (tmp+tmp2)>>1;
-  *dest=tmp;
-@@ -13414,9 +13775,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp);
- tmp = (tmp+tmp2)>>1;
-@@ -13431,10 +13793,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
- tmp = (tmp+tmp2)>>1;
-@@ -13446,10 +13809,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
- FLIP32(tmp);
-@@ -13468,9 +13832,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  *dest=tmp;
-  dest++;
-@@ -13482,9 +13847,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp);
- FLIP32(tmp2);
-@@ -13501,10 +13867,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  *dest=tmp;
-@@ -13517,10 +13884,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
- FLIP32(tmp);
-@@ -13681,9 +14049,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp <<= 8;
-@@ -13698,9 +14067,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp <<= 8;
-@@ -13719,10 +14089,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=32768;
-@@ -13738,10 +14109,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=32768;
-@@ -13764,9 +14136,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp <<= 8;
-@@ -13782,9 +14155,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=32768;
-  tmp <<= 8;
-@@ -13805,10 +14179,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=32768;
-@@ -13825,10 +14200,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=32768;
-@@ -13985,9 +14361,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -14000,9 +14377,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -14019,10 +14397,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 8;
-@@ -14036,10 +14415,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 8;
-@@ -14060,9 +14440,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -14076,9 +14457,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp <<= 8;
-  tmp2 <<= 8;
-@@ -14097,10 +14479,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 8;
-@@ -14115,10 +14498,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp <<= 8;
-@@ -14277,9 +14661,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 16;
-  tmp2 >>= 16;
-@@ -14292,9 +14677,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 16;
-  tmp2 >>= 16;
-@@ -14311,10 +14697,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 16;
-@@ -14328,10 +14715,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 16;
-@@ -14352,9 +14740,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 16;
-  tmp2 >>= 16;
-@@ -14368,9 +14757,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 16;
-  tmp2 >>= 16;
-@@ -14389,10 +14779,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 16;
-@@ -14407,10 +14798,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 16;
-@@ -14573,9 +14965,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=(1<<23);
-  tmp >>= 16;
-@@ -14590,9 +14983,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=(1<<23);
-  tmp >>= 16;
-@@ -14611,10 +15005,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=(1<<23);
-@@ -14630,10 +15025,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=(1<<23);
-@@ -14656,9 +15052,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=(1<<23);
-  tmp >>= 16;
-@@ -14674,9 +15071,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=(1<<23);
-  tmp >>= 16;
-@@ -14697,10 +15095,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=(1<<23);
-@@ -14717,10 +15116,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=(1<<23);
-@@ -14877,9 +15277,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -14892,9 +15293,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -14911,10 +15313,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 8;
-@@ -14928,10 +15331,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 8;
-@@ -14952,9 +15356,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -14968,9 +15373,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -14989,10 +15395,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 8;
-@@ -15007,10 +15414,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 8;
-@@ -15173,9 +15581,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=(1<<23);
-  tmp >>= 8;
-@@ -15190,9 +15599,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=(1<<23);
-  tmp >>= 8;
-@@ -15211,10 +15621,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=(1<<23);
-@@ -15230,10 +15641,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=(1<<23);
-@@ -15256,9 +15668,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=(1<<23);
-  tmp >>= 8;
-@@ -15274,9 +15687,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=(1<<23);
-  tmp >>= 8;
-@@ -15297,10 +15711,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=(1<<23);
-@@ -15317,10 +15732,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=(1<<23);
-@@ -15477,9 +15893,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -15492,9 +15909,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -15511,10 +15929,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 8;
-@@ -15528,10 +15947,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 8;
-@@ -15552,9 +15972,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -15568,9 +15989,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -15589,10 +16011,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 8;
-@@ -15607,10 +16030,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 8;
-@@ -15773,9 +16197,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=(1<<23);
-  tmp >>= 8;
-@@ -15790,9 +16215,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=(1<<23);
-  tmp >>= 8;
-@@ -15811,10 +16237,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=(1<<23);
-@@ -15830,10 +16257,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=(1<<23);
-@@ -15856,9 +16284,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=(1<<23);
-  tmp >>= 8;
-@@ -15874,9 +16303,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=(1<<23);
-  tmp >>= 8;
-@@ -15897,10 +16327,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=(1<<23);
-@@ -15917,10 +16348,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=(1<<23);
-@@ -16069,9 +16501,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- tmp = (tmp+tmp2)>>1;
-  *dest=tmp;
-@@ -16082,9 +16515,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp);
- tmp = (tmp+tmp2)>>1;
-@@ -16099,10 +16533,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
- tmp = (tmp+tmp2)>>1;
-@@ -16114,10 +16549,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
- FLIP32(tmp);
-@@ -16136,9 +16572,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  *dest=tmp;
-  dest++;
-@@ -16150,9 +16587,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp);
- FLIP32(tmp2);
-@@ -16169,10 +16607,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  *dest=tmp;
-@@ -16185,10 +16624,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
- FLIP32(tmp);
-@@ -16341,9 +16781,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=(1<<23);
-  tmp2+=(1<<23);
-@@ -16356,9 +16797,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=(1<<23);
-  tmp2+=(1<<23);
-@@ -16375,10 +16817,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=(1<<23);
-@@ -16392,10 +16835,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=(1<<23);
-@@ -16416,9 +16860,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=(1<<23);
-  tmp2+=(1<<23);
-@@ -16432,9 +16877,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp+=(1<<23);
-  tmp2+=(1<<23);
-@@ -16453,10 +16899,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=(1<<23);
-@@ -16471,10 +16918,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp+=(1<<23);
-@@ -16641,9 +17089,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=(1<<23);
-  tmp >>= 16;
-@@ -16658,9 +17107,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=(1<<23);
-  tmp >>= 16;
-@@ -16679,10 +17129,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=(1<<23);
-@@ -16698,10 +17149,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=(1<<23);
-@@ -16724,9 +17176,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=(1<<23);
-  tmp >>= 16;
-@@ -16742,9 +17195,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=(1<<23);
-  tmp >>= 16;
-@@ -16765,10 +17219,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=(1<<23);
-@@ -16785,10 +17240,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=(1<<23);
-@@ -16945,9 +17401,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 16;
-  tmp2 >>= 16;
-@@ -16960,9 +17417,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 16;
-  tmp2 >>= 16;
-@@ -16979,10 +17437,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 16;
-@@ -16996,10 +17455,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 16;
-@@ -17020,9 +17480,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 16;
-  tmp2 >>= 16;
-@@ -17036,9 +17497,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 16;
-  tmp2 >>= 16;
-@@ -17057,10 +17519,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 16;
-@@ -17075,10 +17538,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 16;
-@@ -17241,9 +17705,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=(1<<23);
-  tmp >>= 8;
-@@ -17258,9 +17723,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=(1<<23);
-  tmp >>= 8;
-@@ -17279,10 +17745,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=(1<<23);
-@@ -17298,10 +17765,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=(1<<23);
-@@ -17324,9 +17792,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=(1<<23);
-  tmp >>= 8;
-@@ -17342,9 +17811,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=(1<<23);
-  tmp >>= 8;
-@@ -17365,10 +17835,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=(1<<23);
-@@ -17385,10 +17856,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=(1<<23);
-@@ -17545,9 +18017,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -17560,9 +18033,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -17579,10 +18053,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 8;
-@@ -17596,10 +18071,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 8;
-@@ -17620,9 +18096,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -17636,9 +18113,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -17657,10 +18135,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 8;
-@@ -17675,10 +18154,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 8;
-@@ -17841,9 +18321,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=(1<<23);
-  tmp >>= 8;
-@@ -17858,9 +18339,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=(1<<23);
-  tmp >>= 8;
-@@ -17879,10 +18361,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=(1<<23);
-@@ -17898,10 +18381,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=(1<<23);
-@@ -17924,9 +18408,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=(1<<23);
-  tmp >>= 8;
-@@ -17942,9 +18427,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=(1<<23);
-  tmp >>= 8;
-@@ -17965,10 +18451,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=(1<<23);
-@@ -17985,10 +18472,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=(1<<23);
-@@ -18145,9 +18633,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -18160,9 +18649,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -18179,10 +18669,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 8;
-@@ -18196,10 +18687,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 8;
-@@ -18220,9 +18712,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -18236,9 +18729,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp >>= 8;
-  tmp2 >>= 8;
-@@ -18257,10 +18751,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 8;
-@@ -18275,10 +18770,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp >>= 8;
-@@ -18433,9 +18929,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=(1<<23);
-  tmp2-=(1<<23);
-@@ -18448,9 +18945,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=(1<<23);
-  tmp2-=(1<<23);
-@@ -18467,10 +18965,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=(1<<23);
-@@ -18484,10 +18983,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=(1<<23);
-@@ -18508,9 +19008,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=(1<<23);
-  tmp2-=(1<<23);
-@@ -18524,9 +19025,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  tmp-=(1<<23);
-  tmp2-=(1<<23);
-@@ -18545,10 +19047,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=(1<<23);
-@@ -18563,10 +19066,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  tmp-=(1<<23);
-@@ -18713,9 +19217,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- tmp = (tmp+tmp2)>>1;
-  *dest=tmp;
-@@ -18726,9 +19231,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp);
- tmp = (tmp+tmp2)>>1;
-@@ -18743,10 +19249,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
- tmp = (tmp+tmp2)>>1;
-@@ -18758,10 +19265,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
- FLIP32(tmp);
-@@ -18780,9 +19288,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
-  *dest=tmp;
-  dest++;
-@@ -18794,9 +19303,10 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp);
- FLIP32(tmp2);
-@@ -18813,10 +19323,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
-  *dest=tmp;
-@@ -18829,10 +19340,11 @@
- {
- while(frames--)
- {
-+ int32_t tmp2;
-  int32_t tmp=*src;
-  src++;
- FLIP32(tmp);
-- int32_t tmp2=*src;
-+ tmp2=*src;
-  src++;
- FLIP32(tmp2);
- FLIP32(tmp);
diff --git a/emulators/fceu/patches/patch-ae b/emulators/fceu/patches/patch-ae
deleted file mode 100644
index 073f68e3612..00000000000
--- a/emulators/fceu/patches/patch-ae
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2004/11/22 22:54:44 wiz Exp $
---- src/movie.c.orig	2004-11-13 13:41:55.000000000 +0000
-+++ src/movie.c	2004-11-13 13:42:39.000000000 +0000
-@@ -154,7 +154,7 @@
- 
- void FCEUMOV_AddJoy(uint8 *js)
- {
-- int x,y;
-+ int x,y,tmpfix;
- 
-  if(!current) return;	/* Not playback nor recording. */
- 
-@@ -191,7 +191,7 @@
-    tmp &= 0x3;
-    ti=0;
- 
--   int tmpfix = tmp;
-+   tmpfix = tmp;
-    while(tmp--) { nextts |= fgetc(slots[-1 - current]) << (ti * 8); ti++; }
- 
-    // This fixes a bug in movies recorded before version 0.98.11
diff --git a/emulators/fceu/patches/patch-af b/emulators/fceu/patches/patch-af
new file mode 100644
index 00000000000..bd5a749fc42
--- /dev/null
+++ b/emulators/fceu/patches/patch-af
@@ -0,0 +1,44 @@
+$NetBSD: patch-af,v 1.1 2005/10/30 11:47:56 wiz Exp $
+
+Fix display and sync on sound.  Ignore NoWaiting and the rest for now.
+
+--- src/drivers/pc/main.c.orig	2004-09-16 04:55:00.000000000 +0200
++++ src/drivers/pc/main.c
+@@ -466,14 +466,26 @@ void FCEUD_Update(uint8 *XBuf, int32 *Bu
+   if(can > Count) can=Count;
+   else uflow=0;
+ 
+-  WriteSound(Buffer,can);
++  while (Count > 0) {
++    WriteSound(Buffer,can);
++    Count -= can;
++    Buffer += can;
++    if (Count == 0)
++	break;
++    SDL_Delay(1); 
++    can = GetWriteSound();
++    if(can > Count) can=Count;
++   }
+ 
++   if(XBuf && (inited&4) && !(NoWaiting & 2))
++    BlitScreen(XBuf);
++   else
++    printf("skipped\n");
++#if 0
+   //if(uflow) puts("Underflow");
+   tmpcan = GetWriteSound();
+   if((tmpcan < Count*0.90) && !uflow)
+   {
+-   if(XBuf && (inited&4) && !(NoWaiting & 2))
+-    BlitScreen(XBuf);
+    Buffer+=can;
+    Count-=can;
+    if(Count)
+@@ -499,6 +511,7 @@ void FCEUD_Update(uint8 *XBuf, int32 *Bu
+   }
+   #endif
+ 
++#endif
+  }
+  else
+  {
diff --git a/emulators/fceu/patches/patch-ah b/emulators/fceu/patches/patch-ah
new file mode 100644
index 00000000000..bf80b76460e
--- /dev/null
+++ b/emulators/fceu/patches/patch-ah
@@ -0,0 +1,59 @@
+$NetBSD: patch-ah,v 1.1 2005/10/30 11:47:56 wiz Exp $
+
+--- configure.orig	2004-09-16 05:31:55.000000000 +0200
++++ configure
+@@ -308,7 +308,7 @@ ac_includes_default="\
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP CCAS CCASFLAGS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP WIN32_TRUE WIN32_FALSE UNIX_TRUE UNIX_FALSE USE_SEXYAL_TRUE USE_SEXYAL_FALSE NATIVEWIN32_TRUE NATIVEWIN32_FALSE OPENGL_TRUE OPENGL_FALSE HAVE_GTK_TRUE HAVE_GTK_FALSE EGREP SDL_CONFIG SDL_CFLAGS SDL_LIBS C80x86_TRUE C80x86_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP CCAS CCASFLAGS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP WIN32_TRUE WIN32_FALSE UNIX_TRUE UNIX_FALSE USE_SEXYAL_TRUE USE_SEXYAL_FALSE NATIVEWIN32_TRUE NATIVEWIN32_FALSE OPENGL_TRUE OPENGL_FALSE HAVE_GTK_TRUE HAVE_GTK_FALSE EGREP SDL_CONFIG SDL_CFLAGS SDL_LIBS LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -5130,21 +5130,13 @@ _ACEOF
+ fi
+ 
+ 
+-if expr match "$target_cpu" 'i.86' > /dev/null; then
++if echo ${target_cpu} | grep -q 'i.86' > /dev/null; then
+ 	cat >>confdefs.h <<\_ACEOF
+ #define C80x86 1
+ _ACEOF
+ 
+ 
+ 
+-if true; then
+-  C80x86_TRUE=
+-  C80x86_FALSE='#'
+-else
+-  C80x86_TRUE='#'
+-  C80x86_FALSE=
+-fi
+-
+ fi
+ 
+ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+@@ -5589,13 +5581,6 @@ echo "$as_me: error: conditional \"OPENG
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-if test -z "${C80x86_TRUE}" && test -z "${C80x86_FALSE}"; then
+-  { { echo "$as_me:$LINENO: error: conditional \"C80x86\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-echo "$as_me: error: conditional \"C80x86\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+ 
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+@@ -6188,8 +6173,6 @@ s,@EGREP@,$EGREP,;t t
+ s,@SDL_CONFIG@,$SDL_CONFIG,;t t
+ s,@SDL_CFLAGS@,$SDL_CFLAGS,;t t
+ s,@SDL_LIBS@,$SDL_LIBS,;t t
+-s,@C80x86_TRUE@,$C80x86_TRUE,;t t
+-s,@C80x86_FALSE@,$C80x86_FALSE,;t t
+ s,@LIBOBJS@,$LIBOBJS,;t t
+ s,@LTLIBOBJS@,$LTLIBOBJS,;t t
+ CEOF