diff --git a/libavcodec/adx.c b/libavcodec/adx.c
index 4fdca49e83..f13b8a271a 100644
--- a/libavcodec/adx.c
+++ b/libavcodec/adx.c
@@ -213,7 +213,7 @@ static int adx_encode_close(AVCodecContext *avctx)
 }
 
 static int adx_encode_frame(AVCodecContext *avctx,
-                unsigned char *frame, int buf_size, const void *data)
+                uint8_t *frame, int buf_size, void *data)
 {
     ADXContext *c = avctx->priv_data;
     const short *samples = data;
@@ -326,7 +326,7 @@ static void dump(unsigned char *buf,size_t len)
 }
 static int adx_decode_frame(AVCodecContext *avctx,
                 void *data, int *data_size,
-                const uint8_t *buf0, int buf_size)
+                uint8_t *buf0, int buf_size)
 {
     ADXContext *c = avctx->priv_data;
     short *samples = data;
diff --git a/libavcodec/i386/motion_est_mmx.c b/libavcodec/i386/motion_est_mmx.c
index 9e88ce2ce1..d71453a4bd 100644
--- a/libavcodec/i386/motion_est_mmx.c
+++ b/libavcodec/i386/motion_est_mmx.c
@@ -21,9 +21,9 @@
 #include "../dsputil.h"
 
 static const __attribute__ ((aligned(8))) uint64_t round_tab[3]={
-0x0000000000000000,
-0x0001000100010001,
-0x0002000200020002,
+0x0000000000000000ULL,
+0x0001000100010001ULL,
+0x0002000200020002ULL,
 };
 
 static __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL;