Synchronize AAC encoder with renamings in aac.h

[ffmpeg] / libavcodec / intrax8.h

diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h
index 0bbe72ded2f08b135c85ee99eb54840cda8a650c..3f6de67da5d01b6e7489f608f9ba2d0cde204024 100644 (file)
--- a/libavcodec/intrax8.h
+++ b/libavcodec/intrax8.h
@@ -16,6 +16,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef FFMPEG_INTRAX8_H
+#define FFMPEG_INTRAX8_H
+
+#include "bitstream.h"
+#include "mpegvideo.h"
+
 typedef struct{
     VLC * j_ac_vlc[4];//they point to the static j_mb_vlc
     VLC * j_orient_vlc;
@@ -42,10 +48,10 @@ typedef struct{
     int chroma_orient;
     int orient;
     int est_run;
-//#ifdef DEBUG
-    int mode_index[10];//debug only
-//#endif
 } IntraX8Context;
 
 void ff_intrax8_common_init(IntraX8Context * w, MpegEncContext * const s);
+void ff_intrax8_common_end(IntraX8Context * w);
 int  ff_intrax8_decode_picture(IntraX8Context * w, int quant, int halfpq);
+
+#endif /* FFMPEG_INTRAX8_H */