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/h264pred.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/h264pred.c')
| -rw-r--r-- | libavcodec/h264pred.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c index 7045ca7688..3fc3bc76e3 100644 --- a/libavcodec/h264pred.c +++ b/libavcodec/h264pred.c @@ -279,7 +279,7 @@ static void pred4x4_horizontal_up_rv40_nodown_c(uint8_t *src, static void pred4x4_tm_vp8_c(uint8_t *src, const uint8_t *topright, ptrdiff_t stride) { - const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride]; + const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP - src[-1-stride]; uint8_t *top = src-stride; int y; @@ -305,7 +305,7 @@ static void pred16x16_plane_rv40_c(uint8_t *src, ptrdiff_t stride) static void pred16x16_tm_vp8_c(uint8_t *src, ptrdiff_t stride) { - const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride]; + const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP - src[-1-stride]; uint8_t *top = src-stride; int y; @@ -387,7 +387,7 @@ static void pred8x8_dc_rv40_c(uint8_t *src, ptrdiff_t stride) static void pred8x8_tm_vp8_c(uint8_t *src, ptrdiff_t stride) { - const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride]; + const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP - src[-1-stride]; uint8_t *top = src-stride; int y; |