aboutsummaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorDiego Biurrun2011-07-17 13:26:53 +0200
committerDiego Biurrun2011-07-18 01:47:50 +0200
commitc99c0e2625d5f19854586fc2142c673ce05c9f40 (patch)
tree8fdfd9d14ab577feec1187e0e72527de23c2eb72 /libavcodec
parent6eaaf8da88f8fff9160c92c84128c182f934e0d9 (diff)
tta: remove disabled code
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/tta.c31
1 files changed, 0 insertions, 31 deletions
diff --git a/libavcodec/tta.c b/libavcodec/tta.c
index 001b1197b6..96de9c3202 100644
--- a/libavcodec/tta.c
+++ b/libavcodec/tta.c
@@ -66,23 +66,6 @@ typedef struct TTAContext {
TTAChannel *ch_ctx;
} TTAContext;
-#if 0
-static inline int shift_1(int i)
-{
- if (i < 32)
- return 1 << i;
- else
- return 0x80000000; // 16 << 31
-}
-
-static inline int shift_16(int i)
-{
- if (i < 28)
- return 16 << i;
- else
- return 0x80000000; // 16 << 27
-}
-#else
static const uint32_t shift_1[] = {
0x00000001, 0x00000002, 0x00000004, 0x00000008,
0x00000010, 0x00000020, 0x00000040, 0x00000080,
@@ -97,7 +80,6 @@ static const uint32_t shift_1[] = {
};
static const uint32_t * const shift_16 = shift_1 + 4;
-#endif
static const int32_t ttafilter_configs[4][2] = {
{10, 1},
@@ -389,19 +371,6 @@ static int tta_decode_frame(AVCodecContext *avctx,
}
*predictor = *p;
-#if 0
- // extract 32bit float from last two int samples
- if (s->is_float && ((p - data) & 1)) {
- uint32_t neg = *p & 0x80000000;
- uint32_t hi = *(p - 1);
- uint32_t lo = abs(*p) - 1;
-
- hi += (hi || lo) ? 0x3f80 : 0;
- // SWAP16: swap all the 16 bits
- *(p - 1) = (hi << 16) | SWAP16(lo) | neg;
- }
-#endif
-
/*if ((get_bits_count(&s->gb)+7)/8 > buf_size)
{
av_log(NULL, AV_LOG_INFO, "overread!!\n");