ref: b92e2e27c42b004b31fc2394d53180e50a760ec3
parent: 367d20be44225752b3974addd9789a821f88b692
author: menno <menno>
date: Fri Jan 17 09:56:18 EST 2003
Small bugfixes
--- a/libfaad/decoder.c
+++ b/libfaad/decoder.c
@@ -16,7 +16,7 @@
** along with this program; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
-** $Id: decoder.c,v 1.46 2002/12/22 19:58:31 menno Exp $
+** $Id: decoder.c,v 1.47 2003/01/17 14:56:15 menno Exp $
**/
#include "common.h"
@@ -413,11 +413,11 @@
elements = raw_data_block(hDecoder, hInfo, ld, syntax_elements,
spec_data, spec_coef, &pce, drc);
- if (hInfo->error > 0)
- goto error;
-
ch_ele = hDecoder->fr_ch_ele;
channels = hDecoder->fr_channels;
+
+ if (hInfo->error > 0)
+ goto error;
/* no more bit reading after this */
--- a/libfaad/libfaad.vcproj
+++ b/libfaad/libfaad.vcproj
@@ -41,7 +41,7 @@
MinimalRebuild="1"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
- AllOptions="/c /I "fftw" /ZI /nologo /W3 /Od /D "_DEBUG" /D "WIN32" /D "_LIB" /D "FFTW_ENABLE_FLOAT" /D "_MBCS" /Gm /EHsc /RTC1 /MTd /YX"StdAfx.h" /Fp".\Debug/libfaad.pch" /Fo".\Debug/" /Fd".\Debug/" /Gd"
+ AllOptions="/c /I "fftw" /ZI /nologo /W3 /Od /D "_DEBUG" /D "WIN32" /D "_LIB" /D "FFTW_ENABLE_FLOAT" /D "_MBCS" /Gm /EHsc /RTC1 /MTd /YX"StdAfx.h" /Fp".\Debug/libfaad.pch" /Fo".\Debug/" /Fd".\Debug/" /Gd <?ICLPrjArgs?> /Qvc7 /Qlocation,link,"E:\Program Files\Microsoft Visual Studio .NET\Vc7\Bin" /c /I "fftw" /ZI /nologo /W3 /Od /D "_DEBUG" /D "WIN32" /D "_LIB" /D "FFTW_ENABLE_FLOAT" /D "_MBCS" /Gm /EHsc /RTC1 /MTd /YX"StdAfx.h" /Fp".\Debug/libfaad.pch" /Fo".\Debug/" /Fd".\Debug/" /Gd <?/ICLPrjArgs?> <?IVCSpawnPrjArgs?> #$UseNonIntelTool #$BinPath:"E:\Program Files\Intel\Compiler70\IA32\Bin;E:\Program Files\Common Files\Intel\Shared Files\IA32\Bin;E:\Program Files\Microsoft Visual Studio .NET\Common7\IDE" #$LibPath:"E:\Program Files\Intel\Compiler70\IA32\Lib;E:\Program Files\Common Files\Intel\Shared Files\IA32\Lib" #$IncPath:"E:\Program Files\Intel\Compiler70\IA32\Include" <?/IVCSpawnPrjArgs?>"
MSOriginalAdditionalOptions=""/>
</Tool>
<Tool
@@ -52,7 +52,7 @@
SuppressStartupBanner="TRUE"
AdditionalOptions="">
<IntelOptions
- AllOptions="/OUT:".\Debug\libfaad.lib" /NOLOGO"
+ AllOptions="/OUT:".\Debug\libfaad.lib" /NOLOGO <?ICLPrjArgs?> /OUT:".\Debug\libfaad.lib" /NOLOGO <?/ICLPrjArgs?> <?IVCSpawnPrjArgs?> #$UseNonIntelTool #$BinPath:"E:\Program Files\Intel\Compiler70\IA32\Bin;E:\Program Files\Common Files\Intel\Shared Files\IA32\Bin;E:\Program Files\Microsoft Visual Studio .NET\Common7\IDE" #$LibPath:"E:\Program Files\Intel\Compiler70\IA32\Lib;E:\Program Files\Common Files\Intel\Shared Files\IA32\Lib" #$IncPath:"E:\Program Files\Intel\Compiler70\IA32\Include" <?/IVCSpawnPrjArgs?>"
MSOriginalAdditionalOptions=""/>
</Tool>
<Tool
@@ -140,7 +140,7 @@
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<IntelOptions
- CompilerName="1"/>
+ CompilerName="0"/>
</Configuration>
</Configurations>
<Files>
--- a/libfaad/syntax.c
+++ b/libfaad/syntax.c
@@ -16,7 +16,7 @@
** along with this program; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
-** $Id: syntax.c,v 1.37 2002/12/22 19:58:31 menno Exp $
+** $Id: syntax.c,v 1.38 2003/01/17 14:56:18 menno Exp $
**/
/*
@@ -613,7 +613,6 @@
if ((result = faad_check_CRC( ld )) > 0)
{
- printf("CRC wrong!\n");
return result;
}
/* error resilient spectral data decoding */