ffmpeg roll of source to mar 9 version...

patched-ffmpeg-mt/libavcodec/bitstream.c

 /*
  * Common bit i/o utils
  * Copyright (c) 2000, 2001 Fabrice Bellard
  * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
  *
  * alternative bitstream reader & writer by Michael Niedermayer <michaelni@gmx.at>
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
@@ skipping 140 matching lines @@
             continue;
         if (!symbols)
             symbol = i;
         else
             GET_DATA(symbol, symbols, i, symbols_wrap, symbols_size);
 #if defined(DEBUG_VLC) && 0
         av_log(NULL,AV_LOG_DEBUG,"i=%d n=%d code=0x%x\n", i, n, code);
 #endif
         /* if code matches the prefix, it is in the table */
         n -= n_prefix;
-        if(flags & INIT_VLC_LE)
-            code_prefix2= code & (n_prefix>=32 ? 0xffffffff : (1 << n_prefix)-1);
-        else
-            code_prefix2= code >> n;
-        if (n > 0 && code_prefix2 == code_prefix) {
-            if (n <= table_nb_bits) {
-                /* no need to add another table */
-                j = (code << (table_nb_bits - n)) & (table_size - 1);
-                nb = 1 << (table_nb_bits - n);
-                for(k=0;k<nb;k++) {
-                    if(flags & INIT_VLC_LE)
-                        j = (code >> n_prefix) + (k<<n);
+        if (n > 0) {
+            if(flags & INIT_VLC_LE)
+                code_prefix2= code & (n_prefix>=32 ? 0xffffffff : (1 << n_prefix)-1);
+            else
+                code_prefix2= code >> n;
+            if (code_prefix2 == code_prefix) {
+                if (n <= table_nb_bits) {
+                    /* no need to add another table */
+                    j = (code << (table_nb_bits - n)) & (table_size - 1);
+                    nb = 1 << (table_nb_bits - n);
+                    for(k=0;k<nb;k++) {
+                        if(flags & INIT_VLC_LE)
+                            j = (code >> n_prefix) + (k<<n);
 #ifdef DEBUG_VLC
-                    av_log(NULL, AV_LOG_DEBUG, "%4x: code=%d n=%d\n",
-                           j, i, n);
+                        av_log(NULL, AV_LOG_DEBUG, "%4x: code=%d n=%d\n",
+                               j, i, n);
 #endif
-                    if (table[j][1] /*bits*/ != 0) {
-                        av_log(NULL, AV_LOG_ERROR, "incorrect codes\n");
-                        return -1;
+                        if (table[j][1] /*bits*/ != 0) {
+                            av_log(NULL, AV_LOG_ERROR, "incorrect codes\n");
+                            return -1;
+                        }
+                        table[j][1] = n; //bits
+                        table[j][0] = symbol;
+                        j++;
                     }
-                    table[j][1] = n; //bits
-                    table[j][0] = symbol;
-                    j++;
+                } else {
+                    n -= table_nb_bits;
+                    j = (code >> ((flags & INIT_VLC_LE) ? n_prefix : n)) & ((1 << table_nb_bits) - 1);
+#ifdef DEBUG_VLC
+                    av_log(NULL,AV_LOG_DEBUG,"%4x: n=%d (subtable)\n",
+                           j, n);
+#endif
+                    /* compute table size */
+                    n1 = -table[j][1]; //bits
+                    if (n > n1)
+                        n1 = n;
+                    table[j][1] = -n1; //bits
                 }
-            } else {
-                n -= table_nb_bits;
-                j = (code >> ((flags & INIT_VLC_LE) ? n_prefix : n)) & ((1 << table_nb_bits) - 1);
-#ifdef DEBUG_VLC
-                av_log(NULL,AV_LOG_DEBUG,"%4x: n=%d (subtable)\n",
-                       j, n);
-#endif
-                /* compute table size */
-                n1 = -table[j][1]; //bits
-                if (n > n1)
-                    n1 = n;
-                table[j][1] = -n1; //bits
             }
         }
     }
 
     /* second pass : fill auxillary tables recursively */
     for(i=0;i<table_size;i++) {
         n = table[i][1]; //bits
         if (n < 0) {
             n = -n;
             if (n > table_nb_bits) {
@@ skipping 78 matching lines @@
         av_log(NULL, AV_LOG_ERROR, "needed %d had %d\n", vlc->table_size, vlc->table_allocated);
     return 0;
 }
 
 
 void free_vlc(VLC *vlc)
 {
     av_freep(&vlc->table);
 }