shithub: aacdec

Info  •  Files  •  Log  •  Branches

Fixes from SF tracker

--- a/frontend/faad.vcproj

+++ b/frontend/faad.vcproj

@@ -105,7 +105,7 @@

 				Name="VCCustomBuildTool"/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalOptions="/MACHINE:I386 "..\libfaad\Release\libfaad.lib" "..\common\mp4v2\ST_Release\libmp4v2_st60.lib" "e:\cvs\audiocoding\faad2\libfaad\Release\libfaad.lib" "e:\cvs\audiocoding\faad2\common\mp4v2\ST_Release\libmp4v2_st60.lib""

+				AdditionalOptions="/MACHINE:I386 "..\libfaad\Release\libfaad.lib" "..\common\mp4v2\ST_Release\libmp4v2_st60.lib" "..\libfaad\Release\libfaad.lib" "..\common\mp4v2\ST_Release\libmp4v2_st60.lib""

 				AdditionalDependencies="ws2_32.lib"

 				OutputFile=".\Release/faad.exe"

 				LinkIncremental="1"

--- a/libfaad/mp4.c

+++ b/libfaad/mp4.c

@@ -27,7 +27,7 @@

 ** Commercial non-GPL licensing of this software is possible.

 ** For more info contact Nero AG through Mpeg4AAClicense@nero.com.

 **

-** $Id: mp4.c,v 1.35 2006/08/06 18:57:15 menno Exp $

+** $Id: mp4.c,v 1.36 2007/06/05 19:00:18 menno Exp $

 **/

 #include "common.h"

@@ -248,7 +248,7 @@

             uint8_t tmp_OTi = (uint8_t)faad_getbits(&ld, 5

                 DEBUGVAR(1,10,"parse_audio_decoder_specific_info(): extensionAudioObjectType"));

-            if (mp4ASC->objectTypeIndex == 5)

+            if (tmp_OTi == 5)

             {

                 mp4ASC->sbr_present_flag = (uint8_t)faad_get1bit(&ld

                     DEBUGVAR(1,11,"parse_audio_decoder_specific_info(): sbr_present_flag"));

--- a/plugins/xmms/src/libmp4.c

+++ b/plugins/xmms/src/libmp4.c

@@ -391,7 +391,7 @@

 			   frameInfo.samples<<1,

 			   sampleBuffer);

 	mp4_ip.output->write_audio(sampleBuffer, frameInfo.samples<<1);

-	if(sampleID > numSamples){

+	if(sampleID >= numSamples){

           break;

 	}

       }