Merge commit '121314895f6360852b2807d5dfafea576b2e6fed'

[ffmpeg] / libavcodec / me_cmp.h

diff --git a/libavcodec/me_cmp.h b/libavcodec/me_cmp.h
index 0dbbcbb1d9a588a32f0fc74c65023e7e924e2f9c..0a589e3c3da1d3902f7a3bf33999d35c2bec6c3c 100644 (file)
--- a/libavcodec/me_cmp.h
+++ b/libavcodec/me_cmp.h
@@ -23,7 +23,7 @@
 
 #include "avcodec.h"
 
-extern uint32_t ff_square_tab[512];
+extern const uint32_t ff_square_tab[512];
 
 
 /* minimum alignment rules ;)
@@ -79,8 +79,6 @@ typedef struct MECmpContext {
     me_cmp_func median_sad[6];
 } MECmpContext;
 
-void ff_me_cmp_init_static(void);
-
 int ff_check_alignment(void);
 
 void ff_me_cmp_init(MECmpContext *c, AVCodecContext *avctx);