simpler

Originally committed as revision 2310 to svn://svn.ffmpeg.org/ffmpeg/trunk

simpler
Originally committed as revision 2310 to svn://svn.ffmpeg.org/ffmpeg/trunk
cd1f22f9 · Michael Niedermayer · 6eb23b82 · cd1f22f9
Commit cd1f22f9 authored Sep 28, 2003 by Michael Niedermayer
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 12 deletions

pcm.c libavcodec/pcm.c +4 -12

No files found.
--- a/libavcodec/pcm.c
+++ b/libavcodec/pcm.c
@@ -45,19 +45,11 @@ static int alaw2linear(unsigned char	a_val)
 	a_val ^= 0x55;
-	t = (a_val & QUANT_MASK) << 4;
+	t = a_val & QUANT_MASK;
 	seg = ((unsigned)a_val & SEG_MASK) >> SEG_SHIFT;
-	switch (seg) {
+	if(seg) t= (t + t + 1 + 32) << (seg + 2);
-	case 0:
+	else    t= (t + t + 1     ) << 3;
-		t += 8;
-		break;
-	case 1:
-		t += 0x108;
-		break;
-	default:
-		t += 0x108;
-		t <<= seg - 1;
-	}
 	return ((a_val & SIGN_BIT) ? t : -t);
 }