[FFmpeg-cvslog] r14867 - in trunk/libavcodec: mdec.c mpeg12.c mpeg12.h

[diego]

Author: diego
Date: Wed Aug 20 19:05:14 2008
New Revision: 14867

Log:
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.


Modified:
   trunk/libavcodec/mdec.c
   trunk/libavcodec/mpeg12.c
   trunk/libavcodec/mpeg12.h

Modified: trunk/libavcodec/mdec.c
==============================================================================
--- trunk/libavcodec/mdec.c	(original)
+++ trunk/libavcodec/mdec.c	Wed Aug 20 19:05:14 2008
@@ -224,7 +224,7 @@ static av_cold int decode_init(AVCodecCo
     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;

Modified: trunk/libavcodec/mpeg12.c
==============================================================================
--- trunk/libavcodec/mpeg12.c	(original)
+++ trunk/libavcodec/mpeg12.c	Wed Aug 20 19:05:14 2008
@@ -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(AVCo
     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;

Modified: trunk/libavcodec/mpeg12.h
==============================================================================
--- trunk/libavcodec/mpeg12.h	(original)
+++ trunk/libavcodec/mpeg12.h	Wed Aug 20 19:05:14 2008
@@ -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)
 {