From ab0a50979b9eb4dfa3320eff7e187e41efedf7a9 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Fri, 8 Aug 2014 14:30:41 +0200 Subject: Update Chromium to beta version 37.0.2062.68 Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca Reviewed-by: Andras Becsi --- chromium/third_party/ffmpeg/libavcodec/rv30dsp.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'chromium/third_party/ffmpeg/libavcodec/rv30dsp.c') diff --git a/chromium/third_party/ffmpeg/libavcodec/rv30dsp.c b/chromium/third_party/ffmpeg/libavcodec/rv30dsp.c index 5e47b647cb6..bd084bff7a5 100644 --- a/chromium/third_party/ffmpeg/libavcodec/rv30dsp.c +++ b/chromium/third_party/ffmpeg/libavcodec/rv30dsp.c @@ -27,12 +27,13 @@ #include "avcodec.h" #include "h264chroma.h" #include "h264qpel.h" +#include "mathops.h" #include "rv34dsp.h" #define RV30_LOWPASS(OPNAME, OP) \ static av_unused void OPNAME ## rv30_tpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, const int C1, const int C2){\ const int h = 8;\ - const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;\ int i;\ for(i = 0; i < h; i++)\ {\ @@ -51,7 +52,7 @@ static av_unused void OPNAME ## rv30_tpel8_h_lowpass(uint8_t *dst, uint8_t *src, \ static void OPNAME ## rv30_tpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, const int C1, const int C2){\ const int w = 8;\ - const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;\ int i;\ for(i = 0; i < w; i++)\ {\ @@ -82,7 +83,7 @@ static void OPNAME ## rv30_tpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstSt static void OPNAME ## rv30_tpel8_hv_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\ const int w = 8;\ const int h = 8;\ - const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;\ int i, j;\ for(j = 0; j < h; j++){\ for(i = 0; i < w; i++){\ @@ -101,7 +102,7 @@ static void OPNAME ## rv30_tpel8_hv_lowpass(uint8_t *dst, uint8_t *src, int dstS static void OPNAME ## rv30_tpel8_hhv_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\ const int w = 8;\ const int h = 8;\ - const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;\ int i, j;\ for(j = 0; j < h; j++){\ for(i = 0; i < w; i++){\ @@ -120,7 +121,7 @@ static void OPNAME ## rv30_tpel8_hhv_lowpass(uint8_t *dst, uint8_t *src, int dst static void OPNAME ## rv30_tpel8_hvv_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\ const int w = 8;\ const int h = 8;\ - const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;\ int i, j;\ for(j = 0; j < h; j++){\ for(i = 0; i < w; i++){\ @@ -139,7 +140,7 @@ static void OPNAME ## rv30_tpel8_hvv_lowpass(uint8_t *dst, uint8_t *src, int dst static void OPNAME ## rv30_tpel8_hhvv_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\ const int w = 8;\ const int h = 8;\ - const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;\ int i, j;\ for(j = 0; j < h; j++){\ for(i = 0; i < w; i++){\ -- cgit v1.2.3