From 86755e82f7f0063f070ca67085cb76b78bc807fa Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Sat, 11 Apr 2009 14:19:09 +0000 Subject: [PATCH] Factorize declaration for the two variants of put_bits(). Originally committed as revision 18439 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/bitstream.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h index 699c4a5c2a..8b9a2b979e 100644 --- a/libavcodec/bitstream.h +++ b/libavcodec/bitstream.h @@ -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(PutBitContext *s, int n, unsigned int value) 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