summaryrefslogtreecommitdiff
path: root/core/multimedia/opieplayer/libmad/huffman.h
Side-by-side diff
Diffstat (limited to 'core/multimedia/opieplayer/libmad/huffman.h') (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/libmad/huffman.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/core/multimedia/opieplayer/libmad/huffman.h b/core/multimedia/opieplayer/libmad/huffman.h
index 1801210..d051949 100644
--- a/core/multimedia/opieplayer/libmad/huffman.h
+++ b/core/multimedia/opieplayer/libmad/huffman.h
@@ -1,4 +1,4 @@
/*
- * mad - MPEG audio decoder
+ * libmad - MPEG audio decoder library
* Copyright (C) 2000-2001 Robert Leslie
*
@@ -26,4 +26,9 @@ union huffquad {
struct {
unsigned short final : 1;
+ unsigned short bits : 3;
+ unsigned short offset : 12;
+ } ptr;
+ struct {
+ unsigned short final : 1;
unsigned short hlen : 3;
unsigned short v : 1;
@@ -32,4 +37,8 @@ union huffquad {
unsigned short y : 1;
} value;
+ unsigned short final : 1;
+};
+
+union huffpair {
struct {
unsigned short final : 1;
@@ -37,8 +46,4 @@ union huffquad {
unsigned short offset : 12;
} ptr;
- unsigned short final : 1;
-};
-
-union huffpair {
struct {
unsigned short final : 1;
@@ -47,9 +52,4 @@ union huffpair {
unsigned short y : 4;
} value;
- struct {
- unsigned short final : 1;
- unsigned short bits : 3;
- unsigned short offset : 12;
- } ptr;
unsigned short final : 1;
};