lavc/j2kenc: Support AV_PIX_FMT_PAL8.
[ffmpeg.git] / libavcodec / h264pred_template.c
index 3d67dd4..2b30fff 100644 (file)
@@ -21,7 +21,7 @@
 
 /**
  * @file
- * H.264 / AVC / MPEG4 part10 prediction functions.
+ * H.264 / AVC / MPEG-4 part10 prediction functions.
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
@@ -1126,15 +1126,13 @@ static void FUNCC(pred8x8l_horizontal_up)(uint8_t *_src, int has_topleft,
 }
 
 static void FUNCC(pred8x8l_vertical_filter_add)(uint8_t *_src, int16_t *_block, int has_topleft,
-                                     int has_topright, ptrdiff_t stride)
+                                     int has_topright, ptrdiff_t _stride)
 {
     int i;
     pixel *src = (pixel*)_src;
     const dctcoef *block = (const dctcoef*)_block;
     pixel pix[8];
-
-    stride >>= sizeof(pixel)-1;
-
+    int stride = _stride>>(sizeof(pixel)-1);
     PREDICT_8x8_LOAD_TOP;
 
     pix[0] = t0;
@@ -1164,15 +1162,13 @@ static void FUNCC(pred8x8l_vertical_filter_add)(uint8_t *_src, int16_t *_block,
 }
 
 static void FUNCC(pred8x8l_horizontal_filter_add)(uint8_t *_src, int16_t *_block, int has_topleft,
-                               int has_topright, ptrdiff_t stride)
+                               int has_topright, ptrdiff_t _stride)
 {
     int i;
     pixel *src = (pixel*)_src;
     const dctcoef *block = (const dctcoef*)_block;
     pixel pix[8];
-
-    stride >>= sizeof(pixel)-1;
-
+    int stride = _stride>>(sizeof(pixel)-1);
     PREDICT_8x8_LOAD_LEFT;
 
     pix[0] = l0;