[FFmpeg-cvslog] get_bits: move tracing macros to end of file

Mans Rullgard git
Sun Jan 23 21:01:56 CET 2011


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Sun Jan 23 14:01:43 2011 +0000| [a4bff12cddc79e47d16ef1e092242ed5c8f1b3b7] | committer: Michael Niedermayer

get_bits: move tracing macros to end of file

Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit 611a6f59ce91947b25033bb8d0f9311b5c542b05)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a4bff12cddc79e47d16ef1e092242ed5c8f1b3b7
---

 libavcodec/get_bits.h |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h
index 88d2bbf..210ccc7 100644
--- a/libavcodec/get_bits.h
+++ b/libavcodec/get_bits.h
@@ -525,6 +525,27 @@ static av_always_inline int get_vlc2(GetBitContext *s, VLC_TYPE (*table)[2],
     return code;
 }
 
+static inline int decode012(GetBitContext *gb){
+    int n;
+    n = get_bits1(gb);
+    if (n == 0)
+        return 0;
+    else
+        return get_bits1(gb) + 1;
+}
+
+static inline int decode210(GetBitContext *gb){
+    if (get_bits1(gb))
+        return 0;
+    else
+        return 2 - get_bits1(gb);
+}
+
+static inline int get_bits_left(GetBitContext *gb)
+{
+    return gb->size_in_bits - get_bits_count(gb);
+}
+
 //#define TRACE
 
 #ifdef TRACE
@@ -585,25 +606,4 @@ static inline int get_xbits_trace(GetBitContext *s, int n, char *file,
 #define tprintf(p, ...) {}
 #endif
 
-static inline int decode012(GetBitContext *gb){
-    int n;
-    n = get_bits1(gb);
-    if (n == 0)
-        return 0;
-    else
-        return get_bits1(gb) + 1;
-}
-
-static inline int decode210(GetBitContext *gb){
-    if (get_bits1(gb))
-        return 0;
-    else
-        return 2 - get_bits1(gb);
-}
-
-static inline int get_bits_left(GetBitContext *gb)
-{
-    return gb->size_in_bits - get_bits_count(gb);
-}
-
 #endif /* AVCODEC_GET_BITS_H */




More information about the ffmpeg-cvslog mailing list