virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

WMAVoice decoder.

Browse Source 
Originally committed as revision 21770 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ronald S. Bultje 2010-02-12 14:22:41 +00:00
parent cbd3441eec
commit fa65584f12
8 changed files with 4599 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@ -57,6 +57,7 @@ version <next>:
- concat protocol - concat protocol
- Indeo 5 decoder - Indeo 5 decoder
- RTP depacketization of AMR - RTP depacketization of AMR
- WMAVoice decoder

1
MAINTAINERS
View File

@ -207,6 +207,7 @@ Codecs:
vqavideo.c Mike Melanson vqavideo.c Mike Melanson
wavpack.c Kostya Shishkov wavpack.c Kostya Shishkov
wmaprodec.c Sascha Sommer wmaprodec.c Sascha Sommer
wmavoice.c Ronald S. Bultje
wmv2.c Michael Niedermayer wmv2.c Michael Niedermayer
wnv1.c Kostya Shishkov wnv1.c Kostya Shishkov
xan.c Mike Melanson xan.c Mike Melanson

1
doc/general.texi
View File

@ -650,6 +650,7 @@ following image formats are supported:
@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 Pro @tab @tab X @item Windows Media Audio Pro @tab @tab X
@item Windows Media Audio Voice @tab @tab X
@end multitable @end multitable
@code{X} means that encoding (resp. decoding) is supported. @code{X} means that encoding (resp. decoding) is supported.

3
libavcodec/Makefile
View File

@ -343,6 +343,9 @@ OBJS-$(CONFIG_WMAV1_DECODER) += wmadec.o wma.o
OBJS-$(CONFIG_WMAV1_ENCODER) += wmaenc.o wma.o OBJS-$(CONFIG_WMAV1_ENCODER) += wmaenc.o wma.o
OBJS-$(CONFIG_WMAV2_DECODER) += wmadec.o wma.o OBJS-$(CONFIG_WMAV2_DECODER) += wmadec.o wma.o
OBJS-$(CONFIG_WMAV2_ENCODER) += wmaenc.o wma.o OBJS-$(CONFIG_WMAV2_ENCODER) += wmaenc.o wma.o
OBJS-$(CONFIG_WMAVOICE_DECODER) += wmavoice.o \
celp_math.o celp_filters.o \
acelp_vectors.o acelp_filters.o
OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o \ OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o \
msmpeg4.o msmpeg4data.o \ msmpeg4.o msmpeg4data.o \
intrax8.o intrax8dsp.o intrax8.o intrax8dsp.o

1
libavcodec/allcodecs.c
View File

@ -254,6 +254,7 @@ void avcodec_register_all(void)
REGISTER_DECODER (WMAPRO, wmapro); REGISTER_DECODER (WMAPRO, wmapro);
REGISTER_ENCDEC (WMAV1, wmav1); REGISTER_ENCDEC (WMAV1, wmav1);
REGISTER_ENCDEC (WMAV2, wmav2); REGISTER_ENCDEC (WMAV2, wmav2);
REGISTER_DECODER (WMAVOICE, wmavoice);
REGISTER_DECODER (WS_SND1, ws_snd1); REGISTER_DECODER (WS_SND1, ws_snd1);
/* PCM codecs */ /* PCM codecs */

2
libavcodec/avcodec.h
View File

@ -30,7 +30,7 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MAJOR 52
#define LIBAVCODEC_VERSION_MINOR 53 #define LIBAVCODEC_VERSION_MINOR 54
#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, \

1568
libavcodec/wmavoice.c Normal file
View File

File diff suppressed because it is too large Load Diff

3023
libavcodec/wmavoice_data.h Normal file
View File

File diff suppressed because it is too large Load Diff