Mercurial > libavformat.hg

changeset 6057:8a374abb2929 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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>.
author rbultje
date Tue, 25 May 2010 15:39:32 +0000
parents fa395d94bd4a
children 5d4acf33261d
files rmdec.c
diffstat 1 files changed, 0 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/rmdec.c	Tue May 25 10:35:50 2010 +0000
+++ b/rmdec.c	Tue May 25 15:39:32 2010 +0000
@@ -226,10 +226,6 @@
                 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 @@
             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");