Merge commit '42eb9154a83e9a7aedb1168b2f1112af765cf2b5'

[ffmpeg] / libavcodec / snow.h

diff --git a/libavcodec/snow.h b/libavcodec/snow.h
index 2cda5b323df2e555b4251a4226cfff501024fa1b..38810c11d3ef46c6635ac8f6289b66e7988ec01d 100644 (file)
--- a/libavcodec/snow.h
+++ b/libavcodec/snow.h
@@ -22,8 +22,8 @@
 #ifndef AVCODEC_SNOW_H
 #define AVCODEC_SNOW_H
 
-#include "dsputil.h"
 #include "hpeldsp.h"
+#include "me_cmp.h"
 #include "qpeldsp.h"
 #include "snow_dwt.h"
 
@@ -110,7 +110,7 @@ typedef struct SnowContext{
     AVClass *class;
     AVCodecContext *avctx;
     RangeCoder c;
-    DSPContext dsp;
+    MECmpContext mecc;
     HpelDSPContext hdsp;
     QpelDSPContext qdsp;
     VideoDSPContext vdsp;