---
libavutil/bswap.h | 6 ------
libavutil/mathematics.c | 9 ---------
libavutil/softfloat.h | 14 --------------
3 files changed, 0 insertions(+), 29 deletions(-)
diff --git a/libavutil/bswap.h b/libavutil/bswap.h
index c93825f..3657ccd 100644
--- a/libavutil/bswap.h
+++ b/libavutil/bswap.h
@@ -74,11 +74,6 @@ static av_always_inline av_const uint32_t
av_bswap32(uint32_t x)
#ifndef av_bswap64
static inline uint64_t av_const av_bswap64(uint64_t x)
{
-#if 0
- x= ((x<< 8)&0xFF00FF00FF00FF00ULL) | ((x>> 8)&0x00FF00FF00FF00FFULL);
- x= ((x<<16)&0xFFFF0000FFFF0000ULL) | ((x>>16)&0x0000FFFF0000FFFFULL);
- return (x>>32) | (x<<32);
-#else
union {
uint64_t ll;
uint32_t l[2];
@@ -87,7 +82,6 @@ static inline uint64_t av_const av_bswap64(uint64_t x)
r.l[0] = av_bswap32 (w.l[1]);
r.l[1] = av_bswap32 (w.l[0]);
return r.ll;
-#endif
}
#endif
diff --git a/libavutil/mathematics.c b/libavutil/mathematics.c
index 53155c3..21d00b6 100644
--- a/libavutil/mathematics.c
+++ b/libavutil/mathematics.c
@@ -91,7 +91,6 @@ int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum
AVRounding rnd){
else
return a/c*b + (a%c*b + r)/c;
}else{
-#if 1
uint64_t a0= a&0xFFFFFFFF;
uint64_t a1= a>>32;
uint64_t b0= b&0xFFFFFFFF;
@@ -116,14 +115,6 @@ int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c,
enum AVRounding rnd){
}
return t1;
}
-#else
- AVInteger ai;
- ai= av_mul_i(av_int2i(a), av_int2i(b));
- ai= av_add_i(ai, av_int2i(r));
-
- return av_i2int(av_div_i(ai, av_int2i(c)));
- }
-#endif
}
int64_t av_rescale(int64_t a, int64_t b, int64_t c){
diff --git a/libavutil/softfloat.h b/libavutil/softfloat.h
index 3078bd7..6f9aee4 100644
--- a/libavutil/softfloat.h
+++ b/libavutil/softfloat.h
@@ -35,16 +35,10 @@ typedef struct SoftFloat{
static av_const SoftFloat av_normalize_sf(SoftFloat a){
if(a.mant){
-#if 1
while((a.mant + 0x20000000U)<0x40000000U){
a.mant += a.mant;
a.exp -= 1;
}
-#else
- int s=ONE_BITS + 1 - av_log2(a.mant ^ (a.mant<<1));
- a.exp -= s;
- a.mant <<= s;
-#endif
if(a.exp < MIN_EXP){
a.exp = MIN_EXP;
a.mant= 0;
@@ -56,19 +50,11 @@ static av_const SoftFloat av_normalize_sf(SoftFloat a){
}
static inline av_const SoftFloat av_normalize1_sf(SoftFloat a){
-#if 1
if(a.mant + 0x40000000 < 0){
a.exp++;
a.mant>>=1;
}
return a;
-#elif 1
- int t= a.mant + 0x40000000 < 0;
- return (SoftFloat){a.exp+t, a.mant>>t};
-#else
- int t= (a.mant + 0x40000000U)>>31;
- return (SoftFloat){a.exp+t, a.mant>>t};
-#endif
}
/**
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
