From: Andre Noll <maan@systemlinux.org>
Date: Sun, 18 Oct 2009 20:56:26 +0000 (+0200)
Subject: Uninline get_vlc().
X-Git-Tag: v0.4.1~55
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=5a8158c86d30905b0684fdf4e74a9bb1d1ba767b;hp=232020d1a15641c8a492c07f79f59df7d4d279ea

Uninline get_vlc().
---

diff --git a/bitstream.c b/bitstream.c
index dedcdead..d9d5233a 100644
--- a/bitstream.c
+++ b/bitstream.c
@@ -163,3 +163,42 @@ void free_vlc(struct vlc *vlc)
 {
 	freep(&vlc->table);
 }
+
+/**
+ * Parse a vlc code.
+ *
+ * \param gbc The getbit context structure.
+ *
+ * \param bits The number of bits which will be read at once, must be
+ * identical to nb_bits in init_vlc().
+ *
+ * \param max_depth The number of times bits bits must be read to completely
+ * read the longest vlc code = (max_vlc_length + bits - 1) / bits.
+ *
+ * \return The vlc code.
+ */
+int get_vlc(struct getbit_context *gbc, VLC_TYPE(*table)[2], int bits,
+		int max_depth)
+{
+	int n, idx, nb_bits, code;
+
+	idx = show_bits(gbc, bits);
+	code = table[idx][0];
+	n = table[idx][1];
+	if (max_depth > 1 && n < 0) {
+		skip_bits(gbc, bits);
+		nb_bits = -n;
+		idx = show_bits(gbc, nb_bits) + code;
+		code = table[idx][0];
+		n = table[idx][1];
+		if (max_depth > 2 && n < 0) {
+			skip_bits(gbc, nb_bits);
+			nb_bits = -n;
+			idx = show_bits(gbc, nb_bits) + code;
+			code = table[idx][0];
+			n = table[idx][1];
+		}
+	}
+	skip_bits(gbc, n);
+	return code;
+}
diff --git a/bitstream.h b/bitstream.h
index 88b62f94..46038842 100644
--- a/bitstream.h
+++ b/bitstream.h
@@ -79,40 +79,7 @@ static inline void init_get_bits(struct getbit_context *gbc,
 
 void init_vlc(struct vlc *vlc, int nb_bits, int nb_codes, const void *bits,
 		const void *codes, int codes_size);
-
 void free_vlc(struct vlc *vlc);
+int get_vlc(struct getbit_context *gbc, VLC_TYPE(*table)[2], int bits,
+		int max_depth);
 
-/**
- * Parse a vlc code.
- *
- * \param bits The number of bits which will be read at once, must be
- * identical to nb_bits in init_vlc()
- *
- * \param max_depth The number of times bits bits must be read to completely
- * read the longest vlc code = (max_vlc_length + bits - 1) / bits.
- */
-static inline int get_vlc(struct getbit_context *gbc, VLC_TYPE(*table)[2],
-		int bits, int max_depth)
-{
-	int n, idx, nb_bits, code;
-
-	idx = show_bits(gbc, bits);
-	code = table[idx][0];
-	n = table[idx][1];
-	if (max_depth > 1 && n < 0) {
-		skip_bits(gbc, bits);
-		nb_bits = -n;
-		idx = show_bits(gbc, nb_bits) + code;
-		code = table[idx][0];
-		n = table[idx][1];
-		if (max_depth > 2 && n < 0) {
-			skip_bits(gbc, nb_bits);
-			nb_bits = -n;
-			idx = show_bits(gbc, nb_bits) + code;
-			code = table[idx][0];
-			n = table[idx][1];
-		}
-	}
-	skip_bits(gbc, n);
-	return code;
-}