aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/aac.h
diff options
context:
space:
mode:
authorRobert Swain <robert.swain@gmail.com>2008-08-15 00:19:14 +0000
committerRobert Swain <robert.swain@gmail.com>2008-08-15 00:19:14 +0000
commit848a5815cebb81d8dcf16bbf550550e98a013e10 (patch)
tree8007d803e8964a2a9a0b073fa99e499848127d60 /libavcodec/aac.h
parent2272e04aa73088969f913f9aad8ad8880d4d2311 (diff)
downloadffmpeg-848a5815cebb81d8dcf16bbf550550e98a013e10.tar.gz
Synchronise AAC decoder code with that from SoC
Originally committed as revision 14772 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/aac.h')
-rw-r--r--libavcodec/aac.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/aac.h b/libavcodec/aac.h
index d1be156586..84ae8f0d77 100644
--- a/libavcodec/aac.h
+++ b/libavcodec/aac.h
@@ -45,8 +45,6 @@
#define MAX_CHANNELS 64
#define MAX_ELEM_ID 16
-#define IVQUANT_SIZE 1024
-
enum AudioObjectType {
AOT_NULL,
// Support? Name
@@ -165,8 +163,7 @@ typedef struct {
typedef struct {
int num_pulse;
- int start;
- int offset[4];
+ int pos[4];
int amp[4];
} Pulse;