diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 03:38:47 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 03:39:51 +0400 |
| commit | 6016b8329bcaf7ce2464c6a291c00ae29a2fcb8f (patch) | |
| tree | 3c518d5f749e551a8b8b591be39328f72b6b0e1b /libavcodec/dsputil.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/dsputil.c')
| -rw-r--r-- | libavcodec/dsputil.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 12665880e6..1b065fd2c6 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -43,7 +43,7 @@ #include "config.h" #include "diracdsp.h" -uint32_t ff_squareTbl[512] = { 0, }; +uint32_t ff_square_tab[512] = { 0, }; #define BIT_DEPTH 16 #include "dsputil_template.c" @@ -186,7 +186,7 @@ static int pix_sum_c(uint8_t *pix, int line_size) static int pix_norm1_c(uint8_t *pix, int line_size) { int s = 0, i, j; - uint32_t *sq = ff_squareTbl + 256; + uint32_t *sq = ff_square_tab + 256; for (i = 0; i < 16; i++) { for (j = 0; j < 16; j += 8) { @@ -257,7 +257,7 @@ static void bswap16_buf(uint16_t *dst, const uint16_t *src, int len) static int sse4_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) { int s = 0, i; - uint32_t *sq = ff_squareTbl + 256; + uint32_t *sq = ff_square_tab + 256; for (i = 0; i < h; i++) { s += sq[pix1[0] - pix2[0]]; @@ -273,7 +273,7 @@ static int sse4_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) static int sse8_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) { int s = 0, i; - uint32_t *sq = ff_squareTbl + 256; + uint32_t *sq = ff_square_tab + 256; for (i = 0; i < h; i++) { s += sq[pix1[0] - pix2[0]]; @@ -293,7 +293,7 @@ static int sse8_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) static int sse16_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) { int s = 0, i; - uint32_t *sq = ff_squareTbl + 256; + uint32_t *sq = ff_square_tab + 256; for (i = 0; i < h; i++) { s += sq[pix1[0] - pix2[0]]; @@ -884,7 +884,7 @@ static void OPNAME ## mpeg4_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, \ int dstStride, int srcStride, \ int h) \ { \ - 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++) { \ @@ -904,7 +904,7 @@ static void OPNAME ## mpeg4_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, \ static void OPNAME ## mpeg4_qpel8_v_lowpass(uint8_t *dst, uint8_t *src, \ int dstStride, int srcStride) \ { \ - const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; \ + const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP; \ const int w = 8; \ int i; \ \ @@ -935,7 +935,7 @@ static void OPNAME ## mpeg4_qpel16_h_lowpass(uint8_t *dst, uint8_t *src, \ int dstStride, int srcStride, \ int h) \ { \ - 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++) { \ @@ -963,7 +963,7 @@ static void OPNAME ## mpeg4_qpel16_h_lowpass(uint8_t *dst, uint8_t *src, \ static void OPNAME ## mpeg4_qpel16_v_lowpass(uint8_t *dst, uint8_t *src, \ int dstStride, int srcStride) \ { \ - const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; \ + const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP; \ const int w = 16; \ int i; \ \ @@ -1569,7 +1569,7 @@ void ff_avg_pixels16x16_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride) static void wmv2_mspel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int h) { - 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++) { @@ -1656,7 +1656,7 @@ DIRAC_MC(avg) static void wmv2_mspel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int w) { - 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++) { @@ -2858,7 +2858,7 @@ av_cold void ff_dsputil_static_init(void) int i; for (i = 0; i < 512; i++) - ff_squareTbl[i] = (i - 256) * (i - 256); + ff_square_tab[i] = (i - 256) * (i - 256); } int ff_check_alignment(void) |