diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 00:38:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 00:39:51 +0100 |
| commit | 6016b8329bcaf7ce2464c6a291c00ae29a2fcb8f (patch) | |
| tree | 3c518d5f749e551a8b8b591be39328f72b6b0e1b /libavcodec/rv40dsp.c | |
| parent | 16f619f57c07f518d4d9fa8de3f23540174ff8ef (diff) | |
| parent | 05563ccacc98fd185affdbf8cbaf094caf36b852 (diff) | |
Merge commit '05563ccacc98fd185affdbf8cbaf094caf36b852'
* commit '05563ccacc98fd185affdbf8cbaf094caf36b852':
dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl names
Conflicts:
libavcodec/bit_depth_template.c
libavcodec/motionpixels_tablegen.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv40dsp.c')
| -rw-r--r-- | libavcodec/rv40dsp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/rv40dsp.c b/libavcodec/rv40dsp.c index 62dd5b57b8..f2ebcf26b5 100644 --- a/libavcodec/rv40dsp.c +++ b/libavcodec/rv40dsp.c @@ -33,7 +33,7 @@ #define RV40_LOWPASS(OPNAME, OP) \ static av_unused void OPNAME ## rv40_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride,\ const int h, const int C1, const int C2, const int SHIFT){\ - 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++)\ {\ @@ -52,7 +52,7 @@ static av_unused void OPNAME ## rv40_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, \ static void OPNAME ## rv40_qpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride,\ const int w, const int C1, const int C2, const int SHIFT){\ - 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++)\ {\ @@ -351,7 +351,7 @@ static av_always_inline void rv40_weak_loop_filter(uint8_t *src, const int lim_q1, const int lim_p1) { - const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP; int i, t, u, diff; for (i = 0; i < 4; i++, src += stride) { |