diff options
| author | Zhou Zongyi <zhouzy@os.pku.edu.cn> | 2010-05-25 15:39:32 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2010-05-25 15:39:32 +0000 |
| commit | aafb822ba5112a70a0cf1e8b29150faf3d3068ac (patch) | |
| tree | f44e247f577c5bbc6bf6b362b28d9b78ed225e57 /libavformat/rmdec.c | |
| parent | 31a7a6eb5e83125c865aca35f70d241dd690c2b7 (diff) | |
| download | ffmpeg-aafb822ba5112a70a0cf1e8b29150faf3d3068ac.tar.gz | |
We're using generic tag-to-ID functions, so specific codec_id assignments
are no longer necessary. Patch by Zhou Zongyi <zhouzy AT os pku edu cn>.
Originally committed as revision 23312 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/rmdec.c')
| -rw-r--r-- | libavformat/rmdec.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index f4603bfb92..89c54dc956 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -226,10 +226,6 @@ static int rm_read_audio_stream_info(AVFormatContext *s, ByteIOContext *pb, return -1; } - if (!strcmp(buf, "cook")) st->codec->codec_id = CODEC_ID_COOK; - else if (!strcmp(buf, "sipr")) st->codec->codec_id = CODEC_ID_SIPR; - else st->codec->codec_id = CODEC_ID_ATRAC3; - ast->audio_framesize = st->codec->block_align; if (st->codec->codec_id == CODEC_ID_SIPR) { if (flavor > 3) { @@ -259,7 +255,6 @@ static int rm_read_audio_stream_info(AVFormatContext *s, ByteIOContext *pb, get_be16(pb); get_byte(pb); if (version == 5) get_byte(pb); - st->codec->codec_id = CODEC_ID_AAC; codecdata_length = get_be32(pb); if(codecdata_length + FF_INPUT_BUFFER_PADDING_SIZE <= (unsigned)codecdata_length){ av_log(s, AV_LOG_ERROR, "codecdata_length too large\n"); |