DirectDraw Surface image decoder

[ffmpeg] / libavcodec / gsmdec_data.h

diff --git a/libavcodec/gsmdec_data.h b/libavcodec/gsmdec_data.h
index b78daa7335f0f7595561e2848ded32c3a084c0c7..f5581d53ba88c10cc5987279e44959cd4802f112 100644 (file)
--- a/libavcodec/gsmdec_data.h
+++ b/libavcodec/gsmdec_data.h
@@ -19,17 +19,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_GSMDEC_DATA
-#define AVCODEC_GSMDEC_DATA
+#ifndef AVCODEC_GSMDEC_DATA_H
+#define AVCODEC_GSMDEC_DATA_H
 
 #include <stdint.h>
+#include "avcodec.h"
 
-// input and output sizes in byte
-#define GSM_BLOCK_SIZE    33
-#define GSM_MS_BLOCK_SIZE 65
-#define GSM_FRAME_SIZE   160
-
-typedef struct {
+typedef struct GSMContext {
     // Contains first 120 elements from the previous frame
     // (used by long_term_synth according to the "lag"),
     // then in the following 160 elements the current
@@ -44,4 +40,6 @@ typedef struct {
 extern const uint16_t ff_gsm_long_term_gain_tab[4];
 extern const int16_t ff_gsm_dequant_tab[64][8];
 
-#endif /* AVCODEC_GSMDEC_DATA */
+extern const int* const ff_gsm_apcm_bits[][4];
+
+#endif /* AVCODEC_GSMDEC_DATA_H */