vp8/armv6: mc: avoid boolean expression in calculation

[ffmpeg] / libavcodec / h264_mc_template.c

diff --git a/libavcodec/h264_mc_template.c b/libavcodec/h264_mc_template.c
index 575320a301d5a2fc151e0b01e52c48e670bd3110..7e6f62f10ada2ae4fed7c0e7ad4c2e6383c06685 100644 (file)
--- a/libavcodec/h264_mc_template.c
+++ b/libavcodec/h264_mc_template.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "h264.h"
+#include "h264dec.h"
 
 #undef MCFUNC
 
@@ -34,23 +34,23 @@
 #undef  mc_part
 #define mc_part MCFUNC(mc_part)
 
-static void mc_part(H264Context *h, H264SliceContext *sl,
+static void mc_part(const H264Context *h, H264SliceContext *sl,
                     int n, int square,
                     int height, int delta,
                     uint8_t *dest_y, uint8_t *dest_cb,
                     uint8_t *dest_cr,
                     int x_offset, int y_offset,
-                    qpel_mc_func *qpix_put,
+                    const qpel_mc_func *qpix_put,
                     h264_chroma_mc_func chroma_put,
-                    qpel_mc_func *qpix_avg,
+                    const qpel_mc_func *qpix_avg,
                     h264_chroma_mc_func chroma_avg,
-                    h264_weight_func *weight_op,
-                    h264_biweight_func *weight_avg,
+                    const h264_weight_func *weight_op,
+                    const h264_biweight_func *weight_avg,
                     int list0, int list1)
 {
-    if ((sl->use_weight == 2 && list0 && list1 &&
-         (sl->implicit_weight[sl->ref_cache[0][scan8[n]]][sl->ref_cache[1][scan8[n]]][h->mb_y & 1] != 32)) ||
-        sl->use_weight == 1)
+    if ((sl->pwt.use_weight == 2 && list0 && list1 &&
+         (sl->pwt.implicit_weight[sl->ref_cache[0][scan8[n]]][sl->ref_cache[1][scan8[n]]][sl->mb_y & 1] != 32)) ||
+        sl->pwt.use_weight == 1)
         mc_part_weighted(h, sl, n, square, height, delta, dest_y, dest_cb, dest_cr,
                          x_offset, y_offset, qpix_put, chroma_put,
                          weight_op[0], weight_op[1], weight_avg[0],
@@ -61,15 +61,15 @@ static void mc_part(H264Context *h, H264SliceContext *sl,
                     chroma_avg, list0, list1, PIXEL_SHIFT, CHROMA_IDC);
 }
 
-static void MCFUNC(hl_motion)(H264Context *h, H264SliceContext *sl,
+static void MCFUNC(hl_motion)(const H264Context *h, H264SliceContext *sl,
                               uint8_t *dest_y,
                               uint8_t *dest_cb, uint8_t *dest_cr,
-                              qpel_mc_func(*qpix_put)[16],
-                              h264_chroma_mc_func(*chroma_put),
-                              qpel_mc_func(*qpix_avg)[16],
-                              h264_chroma_mc_func(*chroma_avg),
-                              h264_weight_func *weight_op,
-                              h264_biweight_func *weight_avg)
+                              const qpel_mc_func(*qpix_put)[16],
+                              const h264_chroma_mc_func(*chroma_put),
+                              const qpel_mc_func(*qpix_avg)[16],
+                              const h264_chroma_mc_func(*chroma_avg),
+                              const h264_weight_func *weight_op,
+                              const h264_biweight_func *weight_avg)
 {
     const int mb_xy   = sl->mb_xy;
     const int mb_type = h->cur_pic.mb_type[mb_xy];