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

[Ronald S. Bultje]

Hi,

On Sun, Jan 23, 2011 at 9:06 AM, Mans Rullgard <mans at mansr.com> wrote:
> Signed-off-by: Mans Rullgard <mans at mansr.com>
> ---
> ?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 */
> --
> 1.7.3.5

OK.

Ronald