Merge commit 'a5ba798c16d0614d982a76755fdd72b37d437170'

[ffmpeg] / libavcodec / snow.h

diff --git a/libavcodec/snow.h b/libavcodec/snow.h
index 2565988a5774ae699e0d27c525a8222bbcf1dcd0..a3b0512490aa9b9cd75e6103c1c58ea126e42dd6 100644 (file)
--- a/libavcodec/snow.h
+++ b/libavcodec/snow.h
@@ -23,11 +23,12 @@
 #define AVCODEC_SNOW_H
 
 #include "dsputil.h"
-#include "dwt.h"
+#include "snow_dwt.h"
 
 #include "rangecoder.h"
 #include "mathops.h"
 #include "mpegvideo.h"
+#include "h264qpel.h"
 
 #define MID_STATE 128
 
@@ -109,7 +110,8 @@ typedef struct SnowContext{
     RangeCoder c;
     DSPContext dsp;
     VideoDSPContext vdsp;
-    DWTContext dwt;
+    H264QpelContext h264qpel;
+    SnowDWTContext dwt;
     AVFrame new_picture;
     AVFrame input_picture;              ///< new_picture with the internal linesizes
     AVFrame current_picture;