# HG changeset patch # User ramiro # Date 1208608112 0 # Node ID 1aa2828680389d36deef6f66f73e8b6dcb3fc6a7 # Parent abc8176ddf88d4c2283feee40346a753a6777bc4 Rename vlc1 to vlc. There is no vlc2, so there is no point in numbering it. diff -r abc8176ddf88 -r 1aa282868038 mimic.c --- a/mimic.c Sat Apr 19 12:04:33 2008 +0000 +++ b/mimic.c Sat Apr 19 12:28:32 2008 +0000 @@ -49,7 +49,7 @@ GetBitContext gb; ScanTable scantable; DSPContext dsp; - VLC vlc1; + VLC vlc; } MimicContext; static const uint32_t huffcodes[] = { @@ -109,7 +109,7 @@ ctx->prev_index = 0; ctx->cur_index = 15; - if(init_vlc(&ctx->vlc1, 8, sizeof(huffbits)/sizeof(huffbits[0]), + if(init_vlc(&ctx->vlc, 8, sizeof(huffbits)/sizeof(huffbits[0]), huffbits, 1, 1, huffcodes, 4, 4, 0)) { av_log(avctx, AV_LOG_ERROR, "error initializing vlc table\n"); return -1; @@ -171,7 +171,7 @@ int value; int coeff; - vlc = get_vlc2(&ctx->gb, ctx->vlc1.table, ctx->vlc1.bits, 4); + vlc = get_vlc2(&ctx->gb, ctx->vlc.table, ctx->vlc.bits, 4); if(!vlc) /* end-of-block code */ return 1; if(vlc == -1) @@ -380,7 +380,7 @@ for(i = 0; i < 16; i++) if(ctx->buf_ptrs[i].data[0]) avctx->release_buffer(avctx, &ctx->buf_ptrs[i]); - free_vlc(&ctx->vlc1); + free_vlc(&ctx->vlc); return 0; }