aboutsummaryrefslogtreecommitdiffstats
path: root/libAACenc/src/adj_thr.cpp
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2016-04-05 16:11:23 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-04-05 16:11:23 +0000
commit0713b4acff1a489e7d49725dc7c5e3dad370b5c8 (patch)
tree6717743d4422e9d88e9a9f1631effd7563a9856b /libAACenc/src/adj_thr.cpp
parentf86e64f5c712edc2f3dd0a9d59d75a8ebd3422ea (diff)
parentef30836651bf059c3120c03dd11e08b6aafdae13 (diff)
downloadfdk-aac-0713b4acff1a489e7d49725dc7c5e3dad370b5c8.tar.gz
fdk-aac-0713b4acff1a489e7d49725dc7c5e3dad370b5c8.tar.bz2
fdk-aac-0713b4acff1a489e7d49725dc7c5e3dad370b5c8.zip
Remove compiler warnings, revised ARM QMF encoder
am: ef30836 * commit 'ef30836651bf059c3120c03dd11e08b6aafdae13': Remove compiler warnings, revised ARM QMF encoder Change-Id: I07babb4dc36b6ad7aebeb62c303a8380e99d691e
Diffstat (limited to 'libAACenc/src/adj_thr.cpp')
-rw-r--r--libAACenc/src/adj_thr.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/libAACenc/src/adj_thr.cpp b/libAACenc/src/adj_thr.cpp
index 6433633..69a70b4 100644
--- a/libAACenc/src/adj_thr.cpp
+++ b/libAACenc/src/adj_thr.cpp
@@ -2,7 +2,7 @@
/* -----------------------------------------------------------------------------------------------------------
Software License for The Fraunhofer FDK AAC Codec Library for Android
-© Copyright 1995 - 2013 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V.
+© Copyright 1995 - 2015 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V.
All rights reserved.
1. INTRODUCTION
@@ -130,14 +130,14 @@ the crash recovery strategy will be activated once.
typedef struct {
INT bitrate;
- LONG bits2PeFactor_mono;
- LONG bits2PeFactor_mono_slope;
- LONG bits2PeFactor_stereo;
- LONG bits2PeFactor_stereo_slope;
- LONG bits2PeFactor_mono_scfOpt;
- LONG bits2PeFactor_mono_scfOpt_slope;
- LONG bits2PeFactor_stereo_scfOpt;
- LONG bits2PeFactor_stereo_scfOpt_slope;
+ ULONG bits2PeFactor_mono;
+ ULONG bits2PeFactor_mono_slope;
+ ULONG bits2PeFactor_stereo;
+ ULONG bits2PeFactor_stereo_slope;
+ ULONG bits2PeFactor_mono_scfOpt;
+ ULONG bits2PeFactor_mono_scfOpt_slope;
+ ULONG bits2PeFactor_stereo_scfOpt;
+ ULONG bits2PeFactor_stereo_scfOpt_slope;
} BIT_PE_SFAC;