X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavformat%2Frmdec.c;h=89c54dc9563c00f06150e7d52890714b63175119;hp=f4603bfb92fdc4bebb6f9ce4ae24f9dc9e961f9a;hb=aafb822ba5112a70a0cf1e8b29150faf3d3068ac;hpb=31a7a6eb5e83125c865aca35f70d241dd690c2b7 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");