Browse Source

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.

Originally committed as revision 14867 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Diego Biurrun 17 years ago
parent
commit
071083b4a5
3 changed files with 4 additions and 4 deletions
  1. +1
    -1
      libavcodec/mdec.c
  2. +2
    -2
      libavcodec/mpeg12.c
  3. +1
    -1
      libavcodec/mpeg12.h

+ 1
- 1
libavcodec/mdec.c View File

@@ -224,7 +224,7 @@ static av_cold int decode_init(AVCodecContext *avctx){
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;


+ 2
- 2
libavcodec/mpeg12.c View File

@@ -148,7 +148,7 @@ static VLC mb_ptype_vlc;
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 @@ static av_cold int mpeg_decode_init(AVCodecContext *avctx)
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;


+ 1
- 1
libavcodec/mpeg12.h View File

@@ -33,7 +33,7 @@ static VLC dc_chroma_vlc;
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)
{


Loading…
Cancel
Save