Alpha: move dsputil prototypes to a header file

[ffmpeg] / libavcodec / bitstream.c

diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c
index 0af24b959cb46b038887d179fd9bfb91df04dbca..a04c4a0ddf92dacab7637fac7512d546d84ece98 100644 (file)
--- a/libavcodec/bitstream.c
+++ b/libavcodec/bitstream.c
@@ -38,25 +38,6 @@ const uint8_t ff_log2_run[32]={
  8, 9,10,11,12,13,14,15
 };
 
-#if LIBAVCODEC_VERSION_MAJOR < 53
-/**
- * Same as av_mallocz_static(), but does a realloc.
- *
- * @param[in] ptr The block of memory to reallocate.
- * @param[in] size The requested size.
- * @return Block of memory of requested size.
- * @deprecated. Code which uses ff_realloc_static is broken/misdesigned
- * and should correctly use static arrays
- */
-attribute_deprecated av_alloc_size(2)
-static void *ff_realloc_static(void *ptr, unsigned int size);
-
-static void *ff_realloc_static(void *ptr, unsigned int size)
-{
-    return av_realloc(ptr, size);
-}
-#endif
-
 void align_put_bits(PutBitContext *s)
 {
 #ifdef ALT_BITSTREAM_WRITER
@@ -66,14 +47,14 @@ void align_put_bits(PutBitContext *s)
 #endif
 }
 
-void ff_put_string(PutBitContext * pbc, const char *s, int terminate_string)
+void ff_put_string(PutBitContext *pb, const char *string, int terminate_string)
 {
-    while(*s){
-        put_bits(pbc, 8, *s);
-        s++;
+    while(*string){
+        put_bits(pb, 8, *string);
+        string++;
     }
     if(terminate_string)
-        put_bits(pbc, 8, 0);
+        put_bits(pb, 8, 0);
 }
 
 void ff_copy_bits(PutBitContext *pb, const uint8_t *src, int length)
@@ -177,42 +158,44 @@ static int build_table(VLC *vlc, int table_nb_bits,
 #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);
+                } 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);
+                    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
+                    /* compute table size */
+                    n1 = -table[j][1]; //bits
+                    if (n > n1)
+                        n1 = n;
+                    table[j][1] = -n1; //bits
+                }
             }
         }
     }