[FFmpeg-cvslog] r23312 - trunk/libavformat/rmdec.c

[rbultje]

Author: rbultje
Date: Tue May 25 17:39:32 2010
New Revision: 23312

Log:
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>.

Modified:
   trunk/libavformat/rmdec.c

Modified: trunk/libavformat/rmdec.c
==============================================================================
--- trunk/libavformat/rmdec.c	Tue May 25 16:23:48 2010	(r23311)
+++ trunk/libavformat/rmdec.c	Tue May 25 17:39:32 2010	(r23312)
@@ -226,10 +226,6 @@ static int rm_read_audio_stream_info(AVF
                 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(AVF
             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");