# HG changeset patch # User kostya # Date 1199351816 0 # Node ID a2b438bcb1d23df58aba8be55ae5651d21e77207 # Parent b7905ea98b8fefefbaf07920493a5d9808ac339d Make decode210() common function. diff -r b7905ea98b8f -r a2b438bcb1d2 bitstream.h --- a/bitstream.h Thu Jan 03 02:26:29 2008 +0000 +++ b/bitstream.h Thu Jan 03 09:16:56 2008 +0000 @@ -950,4 +950,11 @@ return get_bits1(gb) + 1; } +static inline int decode210(GetBitContext *gb){ + if (get_bits1(gb)) + return 0; + else + return 2 - get_bits1(gb); +} + #endif /* FFMPEG_BITSTREAM_H */ diff -r b7905ea98b8f -r a2b438bcb1d2 rv34.c --- a/rv34.c Thu Jan 03 02:26:29 2008 +0000 +++ b/rv34.c Thu Jan 03 09:16:56 2008 +0000 @@ -359,13 +359,6 @@ * @{ */ -static inline int decode210(GetBitContext *gb){ - if (get_bits1(gb)) - return 0; - else - return 2 - get_bits1(gb); -} - /** * Decode starting slice position. * @todo Maybe replace with ff_h263_decode_mba() ? diff -r b7905ea98b8f -r a2b438bcb1d2 vc1.c --- a/vc1.c Thu Jan 03 02:26:29 2008 +0000 +++ b/vc1.c Thu Jan 03 09:16:56 2008 +0000 @@ -44,13 +44,6 @@ static const uint16_t table_mb_intra[64][2]; -static inline int decode210(GetBitContext *gb){ - if (get_bits1(gb)) - return 0; - else - return 2 - get_bits1(gb); -} - /** * Init VC-1 specific tables and VC1Context members * @param v The VC1Context to initialize