cinepak: use the AVFrame API properly.

[ffmpeg] / libavcodec / wmv2.h

diff --git a/libavcodec/wmv2.h b/libavcodec/wmv2.h
index 80f36ccddbc70ee6e1f7323d85ce74591c01b3f2..e01f6c115bb7d1840cd909100a06bb8ab5e263ec 100644 (file)
--- a/libavcodec/wmv2.h
+++ b/libavcodec/wmv2.h
@@ -22,9 +22,9 @@
 #define AVCODEC_WMV2_H
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mpegvideo.h"
 #include "intrax8.h"
+#include "wmv2dsp.h"
 
 #define SKIP_TYPE_NONE 0
 #define SKIP_TYPE_MPEG 1
@@ -35,6 +35,7 @@
 typedef struct Wmv2Context{
     MpegEncContext s;
     IntraX8Context x8;
+    WMV2DSPContext wdsp;
     int j_type_bit;
     int j_type;
     int abt_flag;
@@ -50,7 +51,7 @@ typedef struct Wmv2Context{
     int hshift;
 
     ScanTable abt_scantable[2];
-    DECLARE_ALIGNED(16, DCTELEM, abt_block2)[6][64];
+    DECLARE_ALIGNED(16, int16_t, abt_block2)[6][64];
 }Wmv2Context;
 
 void ff_wmv2_common_init(Wmv2Context * w);