diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-08-20 17:05:14 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-08-20 17:05:14 +0000 |
| commit | 071083b4a5642c56dbe0b0e957fd84b7549dea5c (patch) | |
| tree | 4e553e733efd8ffa9c90f6113e5bcaa159662465 /libavcodec | |
| parent | 054480a57b9b5cc751f482aa8b22c100ffc340d1 (diff) | |
| download | ffmpeg-071083b4a5642c56dbe0b0e957fd84b7549dea5c.tar.gz | |
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
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpeg12.c | 4 | ||||
| -rw-r--r-- | libavcodec/mpeg12.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c index 8b1384e30d..37457676a6 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -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; diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 0f9f649c9a..a48a84bd28 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -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; diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index d2ab6e774a..1e919b4d66 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -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) { |