Mercurial > libavformat.hg
comparison asf.c @ 232:eb90c0a5a1ba libavformat
CODEC_ID_MP3LAME is obsolete
author | bellard |
---|---|
date | Mon, 08 Sep 2003 22:04:29 +0000 |
parents | 01bec1059bdf |
children | 3d92f793fd67 |
comparison
equal
deleted
inserted
replaced
231:8ca8b6bc24a5 | 232:eb90c0a5a1ba |
---|---|
868 if (!asf_st->ds_chunk_size | 868 if (!asf_st->ds_chunk_size |
869 || (asf_st->ds_packet_size/asf_st->ds_chunk_size <= 1)) | 869 || (asf_st->ds_packet_size/asf_st->ds_chunk_size <= 1)) |
870 asf_st->ds_span = 0; // disable descrambling | 870 asf_st->ds_span = 0; // disable descrambling |
871 } | 871 } |
872 switch (st->codec.codec_id) { | 872 switch (st->codec.codec_id) { |
873 case CODEC_ID_MP3LAME: | 873 case CODEC_ID_MP3: |
874 st->codec.frame_size = MPA_FRAME_SIZE; | 874 st->codec.frame_size = MPA_FRAME_SIZE; |
875 break; | 875 break; |
876 case CODEC_ID_PCM_S16LE: | 876 case CODEC_ID_PCM_S16LE: |
877 case CODEC_ID_PCM_S16BE: | 877 case CODEC_ID_PCM_S16BE: |
878 case CODEC_ID_PCM_U16LE: | 878 case CODEC_ID_PCM_U16LE: |
1250 "asf format", | 1250 "asf format", |
1251 "video/x-ms-asf", | 1251 "video/x-ms-asf", |
1252 "asf,wmv", | 1252 "asf,wmv", |
1253 sizeof(ASFContext), | 1253 sizeof(ASFContext), |
1254 #ifdef CONFIG_MP3LAME | 1254 #ifdef CONFIG_MP3LAME |
1255 CODEC_ID_MP3LAME, | 1255 CODEC_ID_MP3, |
1256 #else | 1256 #else |
1257 CODEC_ID_MP2, | 1257 CODEC_ID_MP2, |
1258 #endif | 1258 #endif |
1259 CODEC_ID_MSMPEG4V3, | 1259 CODEC_ID_MSMPEG4V3, |
1260 asf_write_header, | 1260 asf_write_header, |
1267 "asf format", | 1267 "asf format", |
1268 "video/x-ms-asf", | 1268 "video/x-ms-asf", |
1269 "asf,wmv", | 1269 "asf,wmv", |
1270 sizeof(ASFContext), | 1270 sizeof(ASFContext), |
1271 #ifdef CONFIG_MP3LAME | 1271 #ifdef CONFIG_MP3LAME |
1272 CODEC_ID_MP3LAME, | 1272 CODEC_ID_MP3, |
1273 #else | 1273 #else |
1274 CODEC_ID_MP2, | 1274 CODEC_ID_MP2, |
1275 #endif | 1275 #endif |
1276 CODEC_ID_MSMPEG4V3, | 1276 CODEC_ID_MSMPEG4V3, |
1277 asf_write_stream_header, | 1277 asf_write_stream_header, |