Commit 9d25f1f6 authored by Mashiat Sarker Shakkhar's avatar Mashiat Sarker Shakkhar Committed by Diego Biurrun

Windows Media Audio Lossless decoder

Decodes 16-bit WMA Lossless encoded files. 24-bit is not supported yet.

Bitstream parser written by Andreas Öman with contributions from
Baptiste Coudurier and Ulion.

Includes a number of bug-fixes from Benjamin Larsson, Michael Niedermayer and
Konstantin Shishkov, shine and polish by Diego Biurrun.
Signed-off-by: 's avatarDiego Biurrun <diego@biurrun.de>
parent 9243ec4a
...@@ -11,6 +11,7 @@ version <next>: ...@@ -11,6 +11,7 @@ version <next>:
- Sun Rasterfile Encoder - Sun Rasterfile Encoder
- remove libpostproc - remove libpostproc
- ID3v2 attached pictures reading and writing - ID3v2 attached pictures reading and writing
- WMA Lossless decoder
version 0.8: version 0.8:
......
...@@ -768,6 +768,7 @@ following image formats are supported: ...@@ -768,6 +768,7 @@ following image formats are supported:
@item Westwood Audio (SND1) @tab @tab X @item Westwood Audio (SND1) @tab @tab X
@item Windows Media Audio 1 @tab X @tab X @item Windows Media Audio 1 @tab X @tab X
@item Windows Media Audio 2 @tab X @tab X @item Windows Media Audio 2 @tab X @tab X
@item Windows Media Audio Lossless @tab @tab X
@item Windows Media Audio Pro @tab @tab X @item Windows Media Audio Pro @tab @tab X
@item Windows Media Audio Voice @tab @tab X @item Windows Media Audio Voice @tab @tab X
@end multitable @end multitable
......
...@@ -418,6 +418,7 @@ OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o vp56dsp.o \ ...@@ -418,6 +418,7 @@ OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o vp56dsp.o \
OBJS-$(CONFIG_VP8_DECODER) += vp8.o vp8dsp.o vp56rac.o OBJS-$(CONFIG_VP8_DECODER) += vp8.o vp8dsp.o vp56rac.o
OBJS-$(CONFIG_VQA_DECODER) += vqavideo.o OBJS-$(CONFIG_VQA_DECODER) += vqavideo.o
OBJS-$(CONFIG_WAVPACK_DECODER) += wavpack.o OBJS-$(CONFIG_WAVPACK_DECODER) += wavpack.o
OBJS-$(CONFIG_WMALOSSLESS_DECODER) += wmalosslessdec.o wma.o
OBJS-$(CONFIG_WMAPRO_DECODER) += wmaprodec.o wma.o OBJS-$(CONFIG_WMAPRO_DECODER) += wmaprodec.o wma.o
OBJS-$(CONFIG_WMAV1_DECODER) += wmadec.o wma.o aactab.o OBJS-$(CONFIG_WMAV1_DECODER) += wmadec.o wma.o aactab.o
OBJS-$(CONFIG_WMAV1_ENCODER) += wmaenc.o wma.o aactab.o OBJS-$(CONFIG_WMAV1_ENCODER) += wmaenc.o wma.o aactab.o
......
...@@ -289,6 +289,7 @@ void avcodec_register_all(void) ...@@ -289,6 +289,7 @@ void avcodec_register_all(void)
REGISTER_DECODER (VMDAUDIO, vmdaudio); REGISTER_DECODER (VMDAUDIO, vmdaudio);
REGISTER_ENCDEC (VORBIS, vorbis); REGISTER_ENCDEC (VORBIS, vorbis);
REGISTER_DECODER (WAVPACK, wavpack); REGISTER_DECODER (WAVPACK, wavpack);
REGISTER_DECODER (WMALOSSLESS, wmalossless);
REGISTER_DECODER (WMAPRO, wmapro); REGISTER_DECODER (WMAPRO, wmapro);
REGISTER_ENCDEC (WMAV1, wmav1); REGISTER_ENCDEC (WMAV1, wmav1);
REGISTER_ENCDEC (WMAV2, wmav2); REGISTER_ENCDEC (WMAV2, wmav2);
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define AVCODEC_VERSION_H #define AVCODEC_VERSION_H
#define LIBAVCODEC_VERSION_MAJOR 54 #define LIBAVCODEC_VERSION_MAJOR 54
#define LIBAVCODEC_VERSION_MINOR 4 #define LIBAVCODEC_VERSION_MINOR 5
#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment