* MSMPEG4 data tables.
*/
-#ifndef MSMPEG4DATA_H
-#define MSMPEG4DATA_H
+#ifndef AVCODEC_MSMPEG4DATA_H
+#define AVCODEC_MSMPEG4DATA_H
-#include "common.h"
+#include "libavutil/common.h"
#include "bitstream.h"
#include "rl.h"
#define WMV1_SCANTABLE_COUNT 4
-extern const uint8_t *wmv1_scantable[WMV1_SCANTABLE_COUNT+1];
+extern const uint8_t wmv1_scantable[WMV1_SCANTABLE_COUNT][64];
#define NB_RL_TABLES 6
extern const uint8_t wmv1_y_dc_scale_table[32];
extern const uint8_t wmv1_c_dc_scale_table[32];
extern const uint8_t old_ff_y_dc_scale_table[32];
-extern const uint8_t old_ff_c_dc_scale_table[32];
extern MVTable mv_tables[2];
extern const uint8_t wmv2_scantableA[64];
extern const uint8_t wmv2_scantableB[64];
-#endif /* MSMPEG4DATA_H */
+#endif /* AVCODEC_MSMPEG4DATA_H */