summaryrefslogtreecommitdiff
path: root/libavcodec/pgssubdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-14 00:38:47 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-14 00:39:51 +0100
commit6016b8329bcaf7ce2464c6a291c00ae29a2fcb8f (patch)
tree3c518d5f749e551a8b8b591be39328f72b6b0e1b /libavcodec/pgssubdec.c
parent16f619f57c07f518d4d9fa8de3f23540174ff8ef (diff)
parent05563ccacc98fd185affdbf8cbaf094caf36b852 (diff)
downloadffmpeg-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/pgssubdec.c')
-rw-r--r--libavcodec/pgssubdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c
index 71c367ce6f..dd618715d2 100644
--- a/libavcodec/pgssubdec.c
+++ b/libavcodec/pgssubdec.c
@@ -260,7 +260,7 @@ static void parse_palette_segment(AVCodecContext *avctx,
PGSSubContext *ctx = avctx->priv_data;
const uint8_t *buf_end = buf + buf_size;
- const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
+ const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
int color_id;
int y, cb, cr, alpha;
int r, g, b, r_add, g_add, b_add;