Makefile.omk sucks in config generated by config4omk.

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

diff --git a/libavcodec/vc1data.h b/libavcodec/vc1data.h
index 5d995d754f18c8c15e05c10cb69c74666ea54f28..0f3c47ea1b3eb37802a7ff9b509d2a188de86c1b 100644 (file)
--- a/libavcodec/vc1data.h
+++ b/libavcodec/vc1data.h
@@ -21,16 +21,16 @@
  */
 
 /**
- * @file vc1data.h
+ * @file libavcodec/vc1data.h
  * VC-1 tables.
  */
 
-#ifndef FFMPEG_VC1DATA_H
-#define FFMPEG_VC1DATA_H
+#ifndef AVCODEC_VC1DATA_H
+#define AVCODEC_VC1DATA_H
 
 #include <stdint.h>
-#include "bitstream.h"
-#include "rational.h"
+#include "libavutil/rational.h"
+#include "get_bits.h"
 
 /** Table for conversion between TTBLK and TTMB */
 extern const int ff_vc1_ttblk_to_tt[3][8];
@@ -143,12 +143,6 @@ extern const uint8_t ff_vc1_mv_diff_bits[4][73];
 /* DC differentials low+hi-mo, p217 are the same as in msmpeg4data .h */
 
 /* Scantables/ZZ scan are at 11.9 (p262) and 8.1.1.12 (p10) */
-extern const int8_t ff_vc1_normal_zz[64];
-extern const int8_t ff_vc1_horizontal_zz [64];
-extern const int8_t ff_vc1_vertical_zz [64];
-extern const int8_t ff_vc1_simple_progressive_8x8_zz [64];
-extern const int8_t ff_vc1_simple_progressive_8x4_zz [32];
-extern const int8_t ff_vc1_simple_progressive_4x8_zz [32];
 extern const int8_t ff_vc1_simple_progressive_4x4_zz [16];
 extern const int8_t ff_vc1_adv_progressive_8x4_zz [32];
 extern const int8_t ff_vc1_adv_progressive_4x8_zz [32];
@@ -160,4 +154,4 @@ extern const int8_t ff_vc1_adv_interlaced_4x4_zz [16];
 /* DQScale as specified in 8.1.3.9 - almost identical to 0x40000/i */
 extern const int32_t ff_vc1_dqscale[63];
 
-#endif /* FFMPEG_VC1DATA_H */
+#endif /* AVCODEC_VC1DATA_H */