diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2003-09-08 22:04:29 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2003-09-08 22:04:29 +0000 |
| commit | 80783dc2c2c611750cf2ff9d3027f283f8a2dc5b (patch) | |
| tree | 973a4a733012a8daebc69cbf7b883db59d0e5809 /libavformat/asf.c | |
| parent | dcedf5867207ea21c5e492434e6466d1aac79de3 (diff) | |
| download | ffmpeg-80783dc2c2c611750cf2ff9d3027f283f8a2dc5b.tar.gz | |
CODEC_ID_MP3LAME is obsolete
Originally committed as revision 2232 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/asf.c')
| -rw-r--r-- | libavformat/asf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/asf.c b/libavformat/asf.c index c05f28e35e..0a22fad341 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -870,7 +870,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) asf_st->ds_span = 0; // disable descrambling } switch (st->codec.codec_id) { - case CODEC_ID_MP3LAME: + case CODEC_ID_MP3: st->codec.frame_size = MPA_FRAME_SIZE; break; case CODEC_ID_PCM_S16LE: @@ -1252,7 +1252,7 @@ static AVOutputFormat asf_oformat = { "asf,wmv", sizeof(ASFContext), #ifdef CONFIG_MP3LAME - CODEC_ID_MP3LAME, + CODEC_ID_MP3, #else CODEC_ID_MP2, #endif @@ -1269,7 +1269,7 @@ static AVOutputFormat asf_stream_oformat = { "asf,wmv", sizeof(ASFContext), #ifdef CONFIG_MP3LAME - CODEC_ID_MP3LAME, + CODEC_ID_MP3, #else CODEC_ID_MP2, #endif |