diff options
Diffstat (limited to 'apps/codecs/libwma')
-rw-r--r-- | apps/codecs/libwma/asf.h | 24 | ||||
-rw-r--r-- | apps/codecs/libwma/wmadec.h | 2 | ||||
-rw-r--r-- | apps/codecs/libwma/wmadeci.c | 2 |
3 files changed, 2 insertions, 26 deletions
diff --git a/apps/codecs/libwma/asf.h b/apps/codecs/libwma/asf.h deleted file mode 100644 index 550e44ddb6..0000000000 --- a/apps/codecs/libwma/asf.h +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | #ifndef _ASF_H | ||
2 | #define _ASF_H | ||
3 | |||
4 | #include <inttypes.h> | ||
5 | |||
6 | /* ASF codec IDs */ | ||
7 | #define ASF_CODEC_ID_WMAV1 0x160 | ||
8 | #define ASF_CODEC_ID_WMAV2 0x161 | ||
9 | |||
10 | struct asf_waveformatex_s { | ||
11 | uint32_t packet_size; | ||
12 | int audiostream; | ||
13 | uint16_t codec_id; | ||
14 | uint16_t channels; | ||
15 | uint32_t rate; | ||
16 | uint32_t bitrate; | ||
17 | uint16_t blockalign; | ||
18 | uint16_t bitspersample; | ||
19 | uint16_t datalen; | ||
20 | uint8_t data[6]; | ||
21 | }; | ||
22 | typedef struct asf_waveformatex_s asf_waveformatex_t; | ||
23 | |||
24 | #endif | ||
diff --git a/apps/codecs/libwma/wmadec.h b/apps/codecs/libwma/wmadec.h index 8af76ae180..5672bfe063 100644 --- a/apps/codecs/libwma/wmadec.h +++ b/apps/codecs/libwma/wmadec.h | |||
@@ -20,7 +20,7 @@ | |||
20 | #ifndef _WMADEC_H | 20 | #ifndef _WMADEC_H |
21 | #define _WMADEC_H | 21 | #define _WMADEC_H |
22 | 22 | ||
23 | #include "asf.h" | 23 | #include <codecs/libasf/asf.h> |
24 | #include "bitstream.h" /* For GetBitContext */ | 24 | #include "bitstream.h" /* For GetBitContext */ |
25 | #include "types.h" | 25 | #include "types.h" |
26 | 26 | ||
diff --git a/apps/codecs/libwma/wmadeci.c b/apps/codecs/libwma/wmadeci.c index 6ff6a176ee..6837456af1 100644 --- a/apps/codecs/libwma/wmadeci.c +++ b/apps/codecs/libwma/wmadeci.c | |||
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | #include <codecs.h> | 25 | #include <codecs.h> |
26 | #include <codecs/lib/codeclib.h> | 26 | #include <codecs/lib/codeclib.h> |
27 | #include "asf.h" | 27 | #include <codecs/libasf/asf.h> |
28 | #include "wmadec.h" | 28 | #include "wmadec.h" |
29 | #include "wmafixed.h" | 29 | #include "wmafixed.h" |
30 | #include "wmadata.h" | 30 | #include "wmadata.h" |