eden-emu/FFmpeg
15
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-05 15:03:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename ff_init_vlcs function to the more descriptive name ff_mpeg12_init_vlcs.

Browse source 
Now that it is exported, this should avoid confusion and name clashes.

Originally committed as revision 14867 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2008-08-20 17:05:14 +00:00
parent 054480a57b
commit 071083b4a5
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libavcodec/mdec.c
View file

@ -224,7 +224,7 @@ static av_cold int decode_init(AVCodecContext *avctx){
AVFrame *p= &a->picture; AVFrame *p= &a->picture;
mdec_common_init(avctx); mdec_common_init(avctx);
ff_init_vlcs(); ff_mpeg12_init_vlcs();
ff_init_scantable(a->dsp.idct_permutation, &a->scantable, ff_zigzag_direct); ff_init_scantable(a->dsp.idct_permutation, &a->scantable, ff_zigzag_direct);
p->qstride= a->mb_width; p->qstride= a->mb_width;

4
libavcodec/mpeg12.c
View file

@ -148,7 +148,7 @@ static VLC mb_ptype_vlc;
static VLC mb_btype_vlc; static VLC mb_btype_vlc;
static VLC mb_pat_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; 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.flags= avctx->flags;
s->mpeg_enc_ctx.flags2= avctx->flags2; s->mpeg_enc_ctx.flags2= avctx->flags2;
ff_mpeg12_common_init(&s->mpeg_enc_ctx); 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_allocated = 0;
s->mpeg_enc_ctx.picture_number = 0; s->mpeg_enc_ctx.picture_number = 0;

2
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]; 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_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) static inline int decode_dc(GetBitContext *gb, int component)
{ {