[FFmpeg-devel] [PATCH 11/15] h264_direct: Fix some warnings about incompatible pointer type

[jamal]

---
 libavcodec/h264_direct.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c
index ce395a3..cf6686f 100644
--- a/libavcodec/h264_direct.c
+++ b/libavcodec/h264_direct.c
@@ -165,7 +165,7 @@ static void pred_spatial_direct_motion(H264Context * const h, int *mb_type){
     int b4_stride = h->b_stride;
     int mb_xy = h->mb_xy, mb_y = s->mb_y;
     int mb_type_col[2];
-    const int16_t (*l1mv0)[2], (*l1mv1)[2];
+    int16_t (*l1mv0)[2], (*l1mv1)[2];
     const int8_t *l1ref0, *l1ref1;
     const int is_b8x8 = IS_8X8(*mb_type);
     unsigned int sub_mb_type= MB_TYPE_L0L1;
@@ -377,9 +377,9 @@ single_col:
                 if(!IS_INTRA(mb_type_col[0]) && !h->ref_list[1][0].long_ref && (   l1ref0[i8] == 0
                                               || (l1ref0[i8] < 0 && l1ref1[i8] == 0
                                                   && h->x264_build>33U))){
-                    const int16_t (*l1mv)[2]= l1ref0[i8] == 0 ? l1mv0 : l1mv1;
+                    int16_t (*l1mv)[2]= l1ref0[i8] == 0 ? l1mv0 : l1mv1;
                     if(IS_SUB_8X8(sub_mb_type)){
-                        const int16_t *mv_col = l1mv[x8*3 + y8*3*b4_stride];
+                        int16_t *mv_col = l1mv[x8*3 + y8*3*b4_stride];
                         if(FFABS(mv_col[0]) <= 1 && FFABS(mv_col[1]) <= 1){
                             if(ref[0] == 0)
                                 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, 0, 4);
@@ -390,7 +390,7 @@ single_col:
                     }else{
                         int m=0;
                     for(i4=0; i4<4; i4++){
-                        const int16_t *mv_col = l1mv[x8*2 + (i4&1) + (y8*2 + (i4>>1))*b4_stride];
+                        int16_t *mv_col = l1mv[x8*2 + (i4&1) + (y8*2 + (i4>>1))*b4_stride];
                         if(FFABS(mv_col[0]) <= 1 && FFABS(mv_col[1]) <= 1){
                             if(ref[0] == 0)
                                 AV_ZERO32(h->mv_cache[0][scan8[i8*4+i4]]);
@@ -416,7 +416,7 @@ static void pred_temp_direct_motion(H264Context * const h, int *mb_type){
     int b4_stride = h->b_stride;
     int mb_xy = h->mb_xy, mb_y = s->mb_y;
     int mb_type_col[2];
-    const int16_t (*l1mv0)[2], (*l1mv1)[2];
+    int16_t (*l1mv0)[2], (*l1mv1)[2];
     const int8_t *l1ref0, *l1ref1;
     const int is_b8x8 = IS_8X8(*mb_type);
     unsigned int sub_mb_type;
@@ -514,7 +514,7 @@ single_col:
                 const int x8 = i8&1;
                 const int y8 = i8>>1;
                 int ref0, scale;
-                const int16_t (*l1mv)[2]= l1mv0;
+                int16_t (*l1mv)[2]= l1mv0;
 
                 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
                     continue;
@@ -578,7 +578,7 @@ single_col:
                 const int x8 = i8&1;
                 const int y8 = i8>>1;
                 int ref0, scale;
-                const int16_t (*l1mv)[2]= l1mv0;
+                int16_t (*l1mv)[2]= l1mv0;
 
                 if(is_b8x8 && !IS_DIRECT(h->sub_mb_type[i8]))
                     continue;
-- 
1.7.8.6