frsh: Export information about the last RTP contract and VRES

[frescor/ffmpeg.git] / libavcodec / msmpeg4data.h

diff --git a/libavcodec/msmpeg4data.h b/libavcodec/msmpeg4data.h
index b9ffb2719776cbe7206d38f90129b2cb582e3bef..69d542fe6f63b7f103526046868c4d0cf68d0a6f 100644 (file)
--- a/libavcodec/msmpeg4data.h
+++ b/libavcodec/msmpeg4data.h
@@ -23,7 +23,7 @@
  */
 
 /**
- * @file msmpeg4data.h
+ * @file libavcodec/msmpeg4data.h
  * MSMPEG4 data tables.
  */
 
@@ -31,7 +31,7 @@
 #define AVCODEC_MSMPEG4DATA_H
 
 #include "libavutil/common.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "rl.h"
 
 /* motion vector table */
@@ -49,7 +49,7 @@ extern VLC ff_msmp4_mb_i_vlc;
 extern VLC ff_msmp4_dc_luma_vlc[2];
 extern VLC ff_msmp4_dc_chroma_vlc[2];
 
-/* intra picture macro block coded block pattern */
+/* intra picture macroblock coded block pattern */
 extern const uint16_t ff_msmp4_mb_i_table[64][2];
 
 extern const uint8_t cbpy_tab[16][2];
@@ -91,7 +91,7 @@ extern const uint32_t ff_table0_dc_chroma[120][2];
 extern const uint32_t ff_table1_dc_chroma[120][2];
 
 #define WMV2_INTER_CBP_TABLE_COUNT 4
-extern const uint32_t (*wmv2_inter_table[WMV2_INTER_CBP_TABLE_COUNT])[2];
+extern const uint32_t (* const wmv2_inter_table[WMV2_INTER_CBP_TABLE_COUNT])[2];
 
 extern const uint8_t wmv2_scantableA[64];
 extern const uint8_t wmv2_scantableB[64];