Commit f7a3ef2a authored by bellard's avatar bellard

added wma decoder


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@1090 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent b276a696
...@@ -74,6 +74,8 @@ void avcodec_register_all(void) ...@@ -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 { ...@@ -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 { ...@@ -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 { ...@@ -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; ...@@ -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;
......
This diff is collapsed.
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