Move check_marker() from get_bits to mpeg4videodec

[ffmpeg] / libavcodec / amrwbdata.h

diff --git a/libavcodec/amrwbdata.h b/libavcodec/amrwbdata.h
index 83a93e997af2e2e05d70100a6a0b3d1eeca3e78c..c0078b3c6e5d9213c9ceae4087c305a53a3bc28d 100644 (file)
--- a/libavcodec/amrwbdata.h
+++ b/libavcodec/amrwbdata.h
@@ -38,7 +38,7 @@
 
 #define MIN_ISF_SPACING     (128.0 / 32768.0) ///< minimum isf gap
 #define PRED_FACTOR         (1.0 / 3.0)
-#define MIN_ENERGY         -14.0              ///< initial innnovation energy (dB)
+#define MIN_ENERGY         -14.0              ///< initial innovation energy (dB)
 #define ENERGY_MEAN         30.0              ///< mean innovation energy (dB) in all modes
 #define PREEMPH_FAC         0.68              ///< factor used to de-emphasize synthesis
 
@@ -66,7 +66,7 @@ enum Mode {
 
 /* All decoded parameters in these structs must be 2 bytes long
  * because of the direct indexing at the frame parsing */
-typedef struct {
+typedef struct AMRWBSubFrame {
     uint16_t adap;                         ///< adaptive codebook index
     uint16_t ltp;                          ///< ltp-filtering flag
     uint16_t vq_gain;                      ///< VQ adaptive and innovative gains
@@ -75,7 +75,7 @@ typedef struct {
     uint16_t pul_il[4];                    ///< LSBs part of codebook index
 } AMRWBSubFrame;
 
-typedef struct {
+typedef struct AMRWBFrame {
     uint16_t vad;                          ///< voice activity detection flag
     uint16_t isp_id[7];                    ///< index of ISP subvectors
     AMRWBSubFrame subframe[4];             ///< data for subframes