# HG changeset patch # User diego # Date 1219251914 0 # Node ID d6390123201dc79949fe5252ec50cbb67a122b83 # Parent 1d04f38681bdb693afb191b6b8434b12fc370da4 Rename ff_init_vlcs function to the more descriptive name ff_mpeg12_init_vlcs. Now that it is exported, this should avoid confusion and name clashes. diff -r 1d04f38681bd -r d6390123201d mdec.c --- a/mdec.c Wed Aug 20 16:59:26 2008 +0000 +++ b/mdec.c Wed Aug 20 17:05:14 2008 +0000 @@ -224,7 +224,7 @@ AVFrame *p= &a->picture; mdec_common_init(avctx); - ff_init_vlcs(); + ff_mpeg12_init_vlcs(); ff_init_scantable(a->dsp.idct_permutation, &a->scantable, ff_zigzag_direct); p->qstride= a->mb_width; diff -r 1d04f38681bd -r d6390123201d mpeg12.c --- a/mpeg12.c Wed Aug 20 16:59:26 2008 +0000 +++ b/mpeg12.c Wed Aug 20 17:05:14 2008 +0000 @@ -148,7 +148,7 @@ static VLC mb_btype_vlc; static VLC mb_pat_vlc; -av_cold void ff_init_vlcs(void) +av_cold void ff_mpeg12_init_vlcs(void) { static int done = 0; @@ -1194,7 +1194,7 @@ s->mpeg_enc_ctx.flags= avctx->flags; s->mpeg_enc_ctx.flags2= avctx->flags2; ff_mpeg12_common_init(&s->mpeg_enc_ctx); - ff_init_vlcs(); + ff_mpeg12_init_vlcs(); s->mpeg_enc_ctx_allocated = 0; s->mpeg_enc_ctx.picture_number = 0; diff -r 1d04f38681bd -r d6390123201d mpeg12.h --- a/mpeg12.h Wed Aug 20 16:59:26 2008 +0000 +++ b/mpeg12.h Wed Aug 20 17:05:14 2008 +0000 @@ -33,7 +33,7 @@ extern uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3]; void ff_mpeg12_common_init(MpegEncContext *s); -void ff_init_vlcs(void); +void ff_mpeg12_init_vlcs(void); static inline int decode_dc(GetBitContext *gb, int component) {