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 550e44d..0000000 --- a/apps/codecs/libwma/asf.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef _ASF_H -#define _ASF_H - -#include <inttypes.h> - -/* ASF codec IDs */ -#define ASF_CODEC_ID_WMAV1 0x160 -#define ASF_CODEC_ID_WMAV2 0x161 - -struct asf_waveformatex_s { - uint32_t packet_size; - int audiostream; - uint16_t codec_id; - uint16_t channels; - uint32_t rate; - uint32_t bitrate; - uint16_t blockalign; - uint16_t bitspersample; - uint16_t datalen; - uint8_t data[6]; -}; -typedef struct asf_waveformatex_s asf_waveformatex_t; - -#endif diff --git a/apps/codecs/libwma/wmadec.h b/apps/codecs/libwma/wmadec.h index 8af76ae..5672bfe 100644 --- a/apps/codecs/libwma/wmadec.h +++ b/apps/codecs/libwma/wmadec.h @@ -20,7 +20,7 @@ #ifndef _WMADEC_H #define _WMADEC_H -#include "asf.h" +#include <codecs/libasf/asf.h> #include "bitstream.h" /* For GetBitContext */ #include "types.h" diff --git a/apps/codecs/libwma/wmadeci.c b/apps/codecs/libwma/wmadeci.c index 6ff6a17..6837456 100644 --- a/apps/codecs/libwma/wmadeci.c +++ b/apps/codecs/libwma/wmadeci.c @@ -24,7 +24,7 @@ #include <codecs.h> #include <codecs/lib/codeclib.h> -#include "asf.h" +#include <codecs/libasf/asf.h> #include "wmadec.h" #include "wmafixed.h" #include "wmadata.h" |