~ft/aacdec

e2defb318bc7f8fec0a515c703dc7a660a4e2454 — menno 14 years ago a952619
Fixes from SF tracker
3 files changed, 4 insertions(+), 4 deletions(-)

M frontend/faad.vcproj
M libfaad/mp4.c
M plugins/xmms/src/libmp4.c
M frontend/faad.vcproj => frontend/faad.vcproj +1 -1
@@ 105,7 105,7 @@
				Name="VCCustomBuildTool"/>
			<Tool
				Name="VCLinkerTool"
				AdditionalOptions="/MACHINE:I386 &quot;..\libfaad\Release\libfaad.lib&quot; &quot;..\common\mp4v2\ST_Release\libmp4v2_st60.lib&quot; &quot;e:\cvs\audiocoding\faad2\libfaad\Release\libfaad.lib&quot; &quot;e:\cvs\audiocoding\faad2\common\mp4v2\ST_Release\libmp4v2_st60.lib&quot;"
				AdditionalOptions="/MACHINE:I386 &quot;..\libfaad\Release\libfaad.lib&quot; &quot;..\common\mp4v2\ST_Release\libmp4v2_st60.lib&quot; &quot;..\libfaad\Release\libfaad.lib&quot; &quot;..\common\mp4v2\ST_Release\libmp4v2_st60.lib&quot;"
				AdditionalDependencies="ws2_32.lib"
				OutputFile=".\Release/faad.exe"
				LinkIncremental="1"

M libfaad/mp4.c => libfaad/mp4.c +2 -2
@@ 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 @@ int8_t AudioSpecificConfig2(uint8_t *pBuffer,
            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"));

M plugins/xmms/src/libmp4.c => plugins/xmms/src/libmp4.c +1 -1
@@ 391,7 391,7 @@ static void *mp4Decode(void *args)
			   frameInfo.samples<<1,
			   sampleBuffer);
	mp4_ip.output->write_audio(sampleBuffer, frameInfo.samples<<1);
	if(sampleID > numSamples){
	if(sampleID >= numSamples){
          break;
	}
      }