Add a function to match a 2 element vector of uint16_t and use it in h263 and svq1

[ffmpeg] / libavcodec / h264pred.c

diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c
index 3282ff47ec7f27c4e61862698b8842d36b832e88..74085b929c5dba97f760a7809f1936cb727436da 100644 (file)
--- a/libavcodec/h264pred.c
+++ b/libavcodec/h264pred.c
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file h264pred.c
+ * @file libavcodec/h264pred.c
  * H.264 / AVC / MPEG4 part10 prediction functions.
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
@@ -995,7 +995,7 @@ static void pred4x4_vertical_add_c(uint8_t *pix, const DCTELEM *block, int strid
         pix[1*stride]= v += block[0];
         pix[2*stride]= v += block[4];
         pix[3*stride]= v += block[8];
-        pix[4*stride]= v += block[12];
+        pix[4*stride]= v +  block[12];
         pix++;
         block++;
     }
@@ -1008,7 +1008,7 @@ static void pred4x4_horizontal_add_c(uint8_t *pix, const DCTELEM *block, int str
         pix[0]= v += block[0];
         pix[1]= v += block[1];
         pix[2]= v += block[2];
-        pix[3]= v += block[3];
+        pix[3]= v +  block[3];
         pix+= stride;
         block+= 4;
     }
@@ -1026,7 +1026,7 @@ static void pred8x8l_vertical_add_c(uint8_t *pix, const DCTELEM *block, int stri
         pix[5*stride]= v += block[32];
         pix[6*stride]= v += block[40];
         pix[7*stride]= v += block[48];
-        pix[8*stride]= v += block[56];
+        pix[8*stride]= v +  block[56];
         pix++;
         block++;
     }
@@ -1043,7 +1043,7 @@ static void pred8x8l_horizontal_add_c(uint8_t *pix, const DCTELEM *block, int st
         pix[4]= v += block[4];
         pix[5]= v += block[5];
         pix[6]= v += block[6];
-        pix[7]= v += block[7];
+        pix[7]= v +  block[7];
         pix+= stride;
         block+= 8;
     }
@@ -1172,4 +1172,6 @@ void ff_h264_pred_init(H264PredContext *h, int codec_id){
     h->pred8x8_add  [ HOR_PRED8x8]= pred8x8_horizontal_add_c;
     h->pred16x16_add[VERT_PRED8x8]= pred16x16_vertical_add_c;
     h->pred16x16_add[ HOR_PRED8x8]= pred16x16_horizontal_add_c;
+
+    if (ARCH_ARM) ff_h264_pred_init_arm(h, codec_id);
 }