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/vp8dsp.c | |
| parent | 16f619f57c07f518d4d9fa8de3f23540174ff8ef (diff) | |
| parent | 05563ccacc98fd185affdbf8cbaf094caf36b852 (diff) | |
| download | ffmpeg-6016b8329bcaf7ce2464c6a291c00ae29a2fcb8f.tar.gz | |
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/vp8dsp.c')
| -rw-r--r-- | libavcodec/vp8dsp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/vp8dsp.c b/libavcodec/vp8dsp.c index 51e17b6a62..fa759dfa11 100644 --- a/libavcodec/vp8dsp.c +++ b/libavcodec/vp8dsp.c @@ -253,7 +253,7 @@ static av_always_inline void filter_common(uint8_t *p, ptrdiff_t stride, int is4 { LOAD_PIXELS int a, f1, f2; - const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP; a = 3*(q0 - p0); @@ -322,7 +322,7 @@ static av_always_inline int hev(uint8_t *p, ptrdiff_t stride, int thresh) static av_always_inline void filter_mbedge(uint8_t *p, ptrdiff_t stride) { int a0, a1, a2, w; - const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP; LOAD_PIXELS @@ -455,7 +455,7 @@ PUT_PIXELS(4) static void put_vp8_epel ## SIZE ## _h ## TAPS ## _c(uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, int h, int mx, int my) \ { \ const uint8_t *filter = subpel_filters[mx-1]; \ - const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; \ + const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP; \ int x, y; \ \ for (y = 0; y < h; y++) { \ @@ -469,7 +469,7 @@ static void put_vp8_epel ## SIZE ## _h ## TAPS ## _c(uint8_t *dst, ptrdiff_t dst static void put_vp8_epel ## SIZE ## _v ## TAPS ## _c(uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, int h, int mx, int my) \ { \ const uint8_t *filter = subpel_filters[my-1]; \ - const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; \ + const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP; \ int x, y; \ \ for (y = 0; y < h; y++) { \ @@ -483,7 +483,7 @@ static void put_vp8_epel ## SIZE ## _v ## TAPS ## _c(uint8_t *dst, ptrdiff_t dst static void put_vp8_epel ## SIZE ## _h ## HTAPS ## v ## VTAPS ## _c(uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, int h, int mx, int my) \ { \ const uint8_t *filter = subpel_filters[mx-1]; \ - const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; \ + const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP; \ int x, y; \ uint8_t tmp_array[(2*SIZE+VTAPS-1)*SIZE]; \ uint8_t *tmp = tmp_array; \ |