Remove unnecessary forward declaration for msmpeg4_memsetw().

[ffmpeg] / libavcodec / mpeg4audio.h

diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h
index 98cddad2b100ba6501425339aac8793cf98bc8c4..59e8f1135b250906eec482fe6694f3c38aaf5d90 100644 (file)
--- a/libavcodec/mpeg4audio.h
+++ b/libavcodec/mpeg4audio.h
@@ -36,6 +36,7 @@ typedef struct {
     int ext_sampling_index;
     int ext_sample_rate;
     int ext_chan_config;
+    int channels;
 } MPEG4AudioConfig;
 
 extern const int ff_mpeg4audio_sample_rates[16];
@@ -84,7 +85,7 @@ enum AudioObjectType {
     AOT_L2,                    ///< Y                       Layer 2
     AOT_L3,                    ///< Y                       Layer 3
     AOT_DST,                   ///< N                       Direct Stream Transfer
-    AOT_ALS,                   ///< N                       Audio LosslesS
+    AOT_ALS,                   ///< Y                       Audio LosslesS
     AOT_SLS,                   ///< N                       Scalable LosslesS
     AOT_SLS_NON_CORE,          ///< N                       Scalable LosslesS (non core)
     AOT_ER_AAC_ELD,            ///< N                       Error Resilient Enhanced Low Delay
@@ -92,7 +93,8 @@ enum AudioObjectType {
     AOT_SMR_MAIN,              ///< N                       Symbolic Music Representation Main
     AOT_USAC_NOSBR,            ///< N                       Unified Speech and Audio Coding (no SBR)
     AOT_SAOC,                  ///< N                       Spatial Audio Object Coding
-    AOT_USAC             = 45, ///< N                       Unified Speech and Audio Coding
+    AOT_LD_SURROUND,           ///< N                       Low Delay MPEG Surround
+    AOT_USAC,                  ///< N                       Unified Speech and Audio Coding
 };
 
 #define MAX_PCE_SIZE 304 ///<Maximum size of a PCE including the 3-bit ID_PCE