Browse Source

added wma decoder

Originally committed as revision 1090 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Fabrice Bellard 23 years ago
parent
commit
bc8d1857fb
4 changed files with 2756 additions and 2 deletions
  1. +2
    -0
      libavcodec/allcodecs.c
  2. +6
    -2
      libavcodec/avcodec.h
  3. +1409
    -0
      libavcodec/wmadata.h
  4. +1339
    -0
      libavcodec/wmadec.c

+ 2
- 0
libavcodec/allcodecs.c View File

@@ -74,6 +74,8 @@ void avcodec_register_all(void)
register_avcodec(&mjpeg_decoder);
register_avcodec(&mp2_decoder);
register_avcodec(&mp3_decoder);
register_avcodec(&wmav1_decoder);
register_avcodec(&wmav2_decoder);
#ifdef CONFIG_AC3
register_avcodec(&ac3_decoder);
#endif


+ 6
- 2
libavcodec/avcodec.h View File

@@ -30,6 +30,8 @@ enum CodecID {
CODEC_ID_SVQ1,
CODEC_ID_DVVIDEO,
CODEC_ID_DVAUDIO,
CODEC_ID_WMAV1,
CODEC_ID_WMAV2,

/* various pcm "codecs" */
CODEC_ID_PCM_S16LE,
@@ -74,7 +76,7 @@ enum SampleFormat {
};

/* in bytes */
#define AVCODEC_MAX_AUDIO_FRAME_SIZE 18432
#define AVCODEC_MAX_AUDIO_FRAME_SIZE 131072

/* motion estimation type, EPZS by default */
enum Motion_Est_ID {
@@ -526,7 +528,7 @@ typedef struct AVCodecContext {
*/
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
(function avcodec_parse_frame()). The frame
@@ -835,6 +837,8 @@ extern AVCodec rv10_decoder;
extern AVCodec svq1_decoder;
extern AVCodec dvvideo_decoder;
extern AVCodec dvaudio_decoder;
extern AVCodec wmav1_decoder;
extern AVCodec wmav2_decoder;
extern AVCodec mjpeg_decoder;
extern AVCodec mp2_decoder;
extern AVCodec mp3_decoder;


+ 1409
- 0
libavcodec/wmadata.h
File diff suppressed because it is too large
View File


+ 1339
- 0
libavcodec/wmadec.c
File diff suppressed because it is too large
View File


Loading…
Cancel
Save