From 7aaae54afcda1f4ea5224d3d9d0ac3ffd69defaf Mon Sep 17 00:00:00 2001 From: Mohamed Tarek Date: Sun, 2 May 2010 18:27:01 +0000 Subject: - Modify metadata/asf.c to use libasf. - Modify the files in libwma to use libasf. - Remove apps/codecs/libwma/asf.h since it's not used now. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25783 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/libwma/asf.h | 24 ------------------------ apps/codecs/libwma/wmadec.h | 2 +- apps/codecs/libwma/wmadeci.c | 2 +- 3 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 apps/codecs/libwma/asf.h (limited to 'apps/codecs/libwma') 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 - -/* 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 #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 #include -#include "asf.h" +#include #include "wmadec.h" #include "wmafixed.h" #include "wmadata.h" -- cgit v1.1