Diffstat (limited to 'core/multimedia/opieplayer/libmad/frame.h') (more/less context) (show whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/libmad/frame.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/multimedia/opieplayer/libmad/frame.h b/core/multimedia/opieplayer/libmad/frame.h index e88d0c8..3b8e454 100644 --- a/core/multimedia/opieplayer/libmad/frame.h +++ b/core/multimedia/opieplayer/libmad/frame.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * mad - MPEG audio decoder | 2 | * libmad - MPEG audio decoder library |
3 | * Copyright (C) 2000-2001 Robert Leslie | 3 | * Copyright (C) 2000-2001 Robert Leslie |
4 | * | 4 | * |
5 | * This program is free software; you can redistribute it and/or modify | 5 | * This program is free software; you can redistribute it and/or modify |
@@ -45,7 +45,6 @@ enum mad_emphasis { | |||
45 | MAD_EMPHASIS_CCITT_J_17 = 3 /* CCITT J.17 emphasis */ | 45 | MAD_EMPHASIS_CCITT_J_17 = 3 /* CCITT J.17 emphasis */ |
46 | }; | 46 | }; |
47 | 47 | ||
48 | struct mad_frame { | ||
49 | struct mad_header { | 48 | struct mad_header { |
50 | enum mad_layer layer; /* audio layer (1, 2, or 3) */ | 49 | enum mad_layer layer; /* audio layer (1, 2, or 3) */ |
51 | enum mad_mode mode; /* channel mode (see above) */ | 50 | enum mad_mode mode; /* channel mode (see above) */ |
@@ -62,7 +61,10 @@ struct mad_frame { | |||
62 | int private_bits; /* private bits (see below) */ | 61 | int private_bits; /* private bits (see below) */ |
63 | 62 | ||
64 | mad_timer_t duration; /* audio playing time of frame */ | 63 | mad_timer_t duration; /* audio playing time of frame */ |
65 | } header; | 64 | }; |
65 | |||
66 | struct mad_frame { | ||
67 | struct mad_header header; /* MPEG audio header */ | ||
66 | 68 | ||
67 | int options; /* decoding options (from stream) */ | 69 | int options; /* decoding options (from stream) */ |
68 | 70 | ||