mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-13 21:28:01 +02:00
100l: Revert accidental commit, restore previous version.
Originally committed as revision 10644 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
1f3a990b3a
commit
b1ef3dfd2b
@ -90,7 +90,6 @@ static inline void renorm_cabac_encoder(CABACContext *c){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if 0
|
|
||||||
static void put_cabac(CABACContext *c, uint8_t * const state, int bit){
|
static void put_cabac(CABACContext *c, uint8_t * const state, int bit){
|
||||||
int RangeLPS= ff_h264_lps_range[2*(c->range&0xC0) + *state];
|
int RangeLPS= ff_h264_lps_range[2*(c->range&0xC0) + *state];
|
||||||
|
|
||||||
@ -260,7 +259,6 @@ static void put_cabac_ueg(CABACContext *c, uint8_t * state, int v, int max, int
|
|||||||
put_cabac_bypass(c, sign);
|
put_cabac_bypass(c, sign);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif /* 0 */
|
|
||||||
|
|
||||||
static void refill(CABACContext *c){
|
static void refill(CABACContext *c){
|
||||||
#if CABAC_BITS == 16
|
#if CABAC_BITS == 16
|
||||||
@ -272,7 +270,6 @@ static void refill(CABACContext *c){
|
|||||||
c->bytestream+= CABAC_BITS/8;
|
c->bytestream+= CABAC_BITS/8;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if 0
|
|
||||||
static void refill2(CABACContext *c){
|
static void refill2(CABACContext *c){
|
||||||
int i, x;
|
int i, x;
|
||||||
|
|
||||||
@ -290,7 +287,6 @@ static void refill2(CABACContext *c){
|
|||||||
c->low += x<<i;
|
c->low += x<<i;
|
||||||
c->bytestream+= CABAC_BITS/8;
|
c->bytestream+= CABAC_BITS/8;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
static inline void renorm_cabac_decoder(CABACContext *c){
|
static inline void renorm_cabac_decoder(CABACContext *c){
|
||||||
while(c->range < 0x100){
|
while(c->range < 0x100){
|
||||||
@ -864,6 +860,5 @@ static int get_cabac_ueg(CABACContext *c, uint8_t * state, int max, int is_signe
|
|||||||
}else
|
}else
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
#endif /* 0 */
|
|
||||||
|
|
||||||
#endif /* CABAC_H */
|
#endif /* CABAC_H */
|
||||||
|
Loading…
Reference in New Issue
Block a user