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/mathtables.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/mathtables.c')
| -rw-r--r-- | libavcodec/mathtables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mathtables.c b/libavcodec/mathtables.c index ec5ba79427..28ab6a6466 100644 --- a/libavcodec/mathtables.c +++ b/libavcodec/mathtables.c @@ -91,7 +91,7 @@ const uint8_t ff_reverse[256] = { #define times4(x) x, x, x, x #define times256(x) times4(times4(times4(times4(times4(x))))) -const uint8_t ff_cropTbl[256 + 2 * 1024] = { +const uint8_t ff_crop_tab[256 + 2 * 1024] = { times256(0x00), 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F, 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F, |