aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFalk Hüffner <mellum@users.sourceforge.net>2002-07-13 19:31:15 +0000
committerFalk Hüffner <mellum@users.sourceforge.net>2002-07-13 19:31:15 +0000
commitd200cab674656357fefe8dcb624e537edfd0a8c3 (patch)
tree0db1bb48a16ca06e19127feeafcd2d7b7dbec2bf
parentc03a717274d8044289576a59752dadf27852571b (diff)
downloadffmpeg-d200cab674656357fefe8dcb624e537edfd0a8c3.tar.gz
Force inlining on get_vlc2.
Originally committed as revision 756 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/common.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/libavcodec/common.h b/libavcodec/common.h
index 65bfc5127b..d9e46cabd3 100644
--- a/libavcodec/common.h
+++ b/libavcodec/common.h
@@ -36,6 +36,12 @@
#define restrict
#endif
+#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
+#define always_inline __attribute__((always_inline)) inline
+#else
+#define always_inline inline
+#endif
+
#ifdef CONFIG_WIN32
/* windows */
@@ -798,7 +804,8 @@ static inline int get_vlc(GetBitContext *s, VLC *vlc)
return code;
}
-static inline int get_vlc2(GetBitContext *s, VLC_TYPE (*table)[2], int bits, int max_depth)
+static always_inline int get_vlc2(GetBitContext *s, VLC_TYPE (*table)[2],
+ int bits, int max_depth)
{
int code;