diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2008-01-03 09:16:56 +0000 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2008-01-03 09:16:56 +0000 |
| commit | b44665c4e648cb04aa4328b80e178f1ef3d85ff5 (patch) | |
| tree | bab93d47dd2695f4118b2dfc689c1aaf8d7b6b65 | |
| parent | ca32534337022b5902c78e44f5f234e2e61d1673 (diff) | |
| download | ffmpeg-b44665c4e648cb04aa4328b80e178f1ef3d85ff5.tar.gz | |
Make decode210() common function.
Originally committed as revision 11382 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/bitstream.h | 7 | ||||
| -rw-r--r-- | libavcodec/rv34.c | 7 | ||||
| -rw-r--r-- | libavcodec/vc1.c | 7 |
3 files changed, 7 insertions, 14 deletions
diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h index ef15f3abf5..854ba99bcc 100644 --- a/libavcodec/bitstream.h +++ b/libavcodec/bitstream.h @@ -950,4 +950,11 @@ static inline int decode012(GetBitContext *gb){ 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 --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 0e3167cca7..fe7f4d6837 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -359,13 +359,6 @@ static inline void rv34_dequant4x4_16x16(DCTELEM *block, int Qdc, int Q) * @{ */ -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 --git a/libavcodec/vc1.c b/libavcodec/vc1.c index b1b55a613c..062dd38d47 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -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 |