Mercurial > libavcodec.hg

diff mpeg4videodec.c @ 10817:d1fe22d92a65 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename mpeg4 intra vlc tables so they contain "mpeg4", this improves readability of msmpeg4 code (one now knows where that table comes from).
author michael
date Fri, 08 Jan 2010 17:41:14 +0000
parents 9abebeca7d1b
children 514dc1c87b2e
line wrap: on
line diff
--- a/mpeg4videodec.c	Fri Jan 08 17:28:43 2010 +0000
+++ b/mpeg4videodec.c	Fri Jan 08 17:41:14 2010 +0000
@@ -872,8 +872,8 @@
           rl = &rvlc_rl_intra;
           rl_vlc = rvlc_rl_intra.rl_vlc[0];
       }else{
-          rl = &rl_intra;
-          rl_vlc = rl_intra.rl_vlc[0];
+          rl = &ff_mpeg4_rl_intra;
+          rl_vlc = ff_mpeg4_rl_intra.rl_vlc[0];
       }
       if (s->ac_pred) {
           if (dc_pred_dir == 0)
@@ -2200,10 +2200,10 @@
     if (!done) {
         done = 1;
 
-        init_rl(&rl_intra, ff_mpeg4_static_rl_table_store[0]);
+        init_rl(&ff_mpeg4_rl_intra, ff_mpeg4_static_rl_table_store[0]);
         init_rl(&rvlc_rl_inter, ff_mpeg4_static_rl_table_store[1]);
         init_rl(&rvlc_rl_intra, ff_mpeg4_static_rl_table_store[2]);
-        INIT_VLC_RL(rl_intra, 554);
+        INIT_VLC_RL(ff_mpeg4_rl_intra, 554);
         INIT_VLC_RL(rvlc_rl_inter, 1072);
         INIT_VLC_RL(rvlc_rl_intra, 1072);
         INIT_VLC_STATIC(&dc_lum, DC_VLC_BITS, 10 /* 13 */,