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/error_resilience.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/error_resilience.c')
| -rw-r--r-- | libavcodec/error_resilience.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index ebd671a740..f1e3da64b2 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -238,7 +238,7 @@ static void h_block_filter(ERContext *s, uint8_t *dst, int w, int h, int stride, int is_luma) { int b_x, b_y, mvx_stride, mvy_stride; - const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP; set_mv_strides(s, &mvx_stride, &mvy_stride); mvx_stride >>= is_luma; mvy_stride *= mvx_stride; @@ -306,7 +306,7 @@ static void v_block_filter(ERContext *s, uint8_t *dst, int w, int h, int stride, int is_luma) { int b_x, b_y, mvx_stride, mvy_stride; - const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP; set_mv_strides(s, &mvx_stride, &mvy_stride); mvx_stride >>= is_luma; mvy_stride *= mvx_stride; |