[FFmpeg-cvslog] r18439 - trunk/libavcodec/bitstream.h

[stefano]

Author: stefano
Date: Sat Apr 11 16:19:09 2009
New Revision: 18439

Log:
Factorize declaration for the two variants of put_bits().

Modified:
   trunk/libavcodec/bitstream.h

Modified: trunk/libavcodec/bitstream.h
==============================================================================
--- trunk/libavcodec/bitstream.h	Sat Apr 11 16:16:30 2009	(r18438)
+++ trunk/libavcodec/bitstream.h	Sat Apr 11 16:19:09 2009	(r18439)
@@ -195,8 +195,8 @@ typedef struct RL_VLC_ELEM {
     uint8_t run;
 } RL_VLC_ELEM;
 
-#ifndef ALT_BITSTREAM_WRITER
 static inline void put_bits(PutBitContext *s, int n, unsigned int value)
+#ifndef ALT_BITSTREAM_WRITER
 {
     unsigned int bit_buf;
     int bit_left;
@@ -246,11 +246,7 @@ static inline void put_bits(PutBitContex
     s->bit_buf = bit_buf;
     s->bit_left = bit_left;
 }
-#endif
-
-
-#ifdef ALT_BITSTREAM_WRITER
-static inline void put_bits(PutBitContext *s, int n, unsigned int value)
+#else  /* ALT_BITSTREAM_WRITER defined */
 {
 #    ifdef ALIGNED_BITSTREAM_WRITER
 #        if ARCH_X86