Originally committed as revision 11382 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
@@ -950,4 +950,11 @@ static inline int decode012(GetBitContext *gb){ | |||||
return get_bits1(gb) + 1; | 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 */ | #endif /* FFMPEG_BITSTREAM_H */ |
@@ -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. | * Decode starting slice position. | ||||
* @todo Maybe replace with ff_h263_decode_mba() ? | * @todo Maybe replace with ff_h263_decode_mba() ? | ||||
@@ -44,13 +44,6 @@ | |||||
static const uint16_t table_mb_intra[64][2]; | 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 | * Init VC-1 specific tables and VC1Context members | ||||
* @param v The VC1Context to initialize | * @param v The VC1Context to initialize | ||||