added wma decoder
Originally committed as revision 1090 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
@@ -74,6 +74,8 @@ void avcodec_register_all(void)
|
|||||||
register_avcodec(&mjpeg_decoder);
|
register_avcodec(&mjpeg_decoder);
|
||||||
register_avcodec(&mp2_decoder);
|
register_avcodec(&mp2_decoder);
|
||||||
register_avcodec(&mp3_decoder);
|
register_avcodec(&mp3_decoder);
|
||||||
|
register_avcodec(&wmav1_decoder);
|
||||||
|
register_avcodec(&wmav2_decoder);
|
||||||
#ifdef CONFIG_AC3
|
#ifdef CONFIG_AC3
|
||||||
register_avcodec(&ac3_decoder);
|
register_avcodec(&ac3_decoder);
|
||||||
#endif
|
#endif
|
||||||
|
@@ -30,6 +30,8 @@ enum CodecID {
|
|||||||
CODEC_ID_SVQ1,
|
CODEC_ID_SVQ1,
|
||||||
CODEC_ID_DVVIDEO,
|
CODEC_ID_DVVIDEO,
|
||||||
CODEC_ID_DVAUDIO,
|
CODEC_ID_DVAUDIO,
|
||||||
|
CODEC_ID_WMAV1,
|
||||||
|
CODEC_ID_WMAV2,
|
||||||
|
|
||||||
/* various pcm "codecs" */
|
/* various pcm "codecs" */
|
||||||
CODEC_ID_PCM_S16LE,
|
CODEC_ID_PCM_S16LE,
|
||||||
@@ -74,7 +76,7 @@ enum SampleFormat {
|
|||||||
};
|
};
|
||||||
|
|
||||||
/* in bytes */
|
/* in bytes */
|
||||||
#define AVCODEC_MAX_AUDIO_FRAME_SIZE 18432
|
#define AVCODEC_MAX_AUDIO_FRAME_SIZE 131072
|
||||||
|
|
||||||
/* motion estimation type, EPZS by default */
|
/* motion estimation type, EPZS by default */
|
||||||
enum Motion_Est_ID {
|
enum Motion_Est_ID {
|
||||||
@@ -526,7 +528,7 @@ typedef struct AVCodecContext {
|
|||||||
*/
|
*/
|
||||||
int dr_ip_buffer_count;
|
int dr_ip_buffer_count;
|
||||||
|
|
||||||
int block_align; /* currently only for adpcm codec in wav/avi */
|
int block_align; /* used by some WAV based audio codecs */
|
||||||
|
|
||||||
int parse_only; /* decoding only: if true, only parsing is done
|
int parse_only; /* decoding only: if true, only parsing is done
|
||||||
(function avcodec_parse_frame()). The frame
|
(function avcodec_parse_frame()). The frame
|
||||||
@@ -835,6 +837,8 @@ extern AVCodec rv10_decoder;
|
|||||||
extern AVCodec svq1_decoder;
|
extern AVCodec svq1_decoder;
|
||||||
extern AVCodec dvvideo_decoder;
|
extern AVCodec dvvideo_decoder;
|
||||||
extern AVCodec dvaudio_decoder;
|
extern AVCodec dvaudio_decoder;
|
||||||
|
extern AVCodec wmav1_decoder;
|
||||||
|
extern AVCodec wmav2_decoder;
|
||||||
extern AVCodec mjpeg_decoder;
|
extern AVCodec mjpeg_decoder;
|
||||||
extern AVCodec mp2_decoder;
|
extern AVCodec mp2_decoder;
|
||||||
extern AVCodec mp3_decoder;
|
extern AVCodec mp3_decoder;
|
||||||
|
1409
libavcodec/wmadata.h
Normal file
1409
libavcodec/wmadata.h
Normal file
File diff suppressed because it is too large
Load Diff
1339
libavcodec/wmadec.c
Normal file
1339
libavcodec/wmadec.c
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user