[SCM] libav/experimental: 100l: Revert accidental commit, restore previous version.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:07:47 UTC 2013
The following commit has been merged in the experimental branch:
commit b1ef3dfd2ba4abbdf8e0dfafa5b10df9ead8a3c2
Author: Diego Biurrun <diego at biurrun.de>
Date: Tue Oct 2 13:14:37 2007 +0000
100l: Revert accidental commit, restore previous version.
Originally committed as revision 10644 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h
index 637a1c6..bb682d9 100644
--- a/libavcodec/cabac.h
+++ b/libavcodec/cabac.h
@@ -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){
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);
}
}
-#endif /* 0 */
static void refill(CABACContext *c){
#if CABAC_BITS == 16
@@ -272,7 +270,6 @@ static void refill(CABACContext *c){
c->bytestream+= CABAC_BITS/8;
}
-#if 0
static void refill2(CABACContext *c){
int i, x;
@@ -290,7 +287,6 @@ static void refill2(CABACContext *c){
c->low += x<<i;
c->bytestream+= CABAC_BITS/8;
}
-#endif
static inline void renorm_cabac_decoder(CABACContext *c){
while(c->range < 0x100){
@@ -864,6 +860,5 @@ static int get_cabac_ueg(CABACContext *c, uint8_t * state, int max, int is_signe
}else
return i;
}
-#endif /* 0 */
#endif /* CABAC_H */
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list