libmad updated

CVS patchset: 1817
CVS date: 2002/04/30 18:46:58

1 files changed, 11 insertions, 13 deletions

diff --git a/src/libmad/huffman.h b/src/libmad/huffman.h
index 198f2f3cb..4a21c1cb9 100644
--- a/src/libmad/huffman.h
+++ b/src/libmad/huffman.h
@@ -1,5 +1,5 @@
 /*
- * mad - MPEG audio decoder
+ * libmad - MPEG audio decoder library
  * Copyright (C) 2000-2001 Robert Leslie
  *
  * This program is free software; you can redistribute it and/or modify
@@ -16,14 +16,18 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: huffman.h,v 1.2 2001/10/03 15:12:09 jkeil Exp $
+ * $Id: huffman.h,v 1.3 2002/04/30 18:46:58 miguelfreitas Exp $
  */
 
 # ifndef LIBMAD_HUFFMAN_H
 # define LIBMAD_HUFFMAN_H
 
 union huffquad {
-  unsigned short _;		/* helper for non-gcc union initialization */
+  struct {
+    unsigned short final  :  1;
+    unsigned short bits   :  3;
+    unsigned short offset : 12;
+  } ptr;
   struct {
     unsigned short final  :  1;
     unsigned short hlen   :  3;
@@ -32,27 +36,21 @@ union huffquad {
     unsigned short x      :  1;
     unsigned short y      :  1;
   } value;
+  unsigned short final    :  1;
+};
+
+union huffpair {
   struct {
     unsigned short final  :  1;
     unsigned short bits   :  3;
     unsigned short offset : 12;
   } ptr;
-  unsigned short final    :  1;
-};
-
-union huffpair {
-  unsigned short _;		/* helper for non-gcc union initialization */
   struct {
     unsigned short final  :  1;
     unsigned short hlen   :  3;
     unsigned short x      :  4;
     unsigned short y      :  4;
   } value;
-  struct {
-    unsigned short final  :  1;
-    unsigned short bits   :  3;
-    unsigned short offset : 12;
-  } ptr;
   unsigned short final    :  1;
 };