diff options
| author | leozhang <leozhang@qiyi.com> | 2019-08-14 11:07:18 +0800 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-08-23 22:24:07 +0200 |
| commit | b2bb09bcc330156e9d79d7ddfa59f9c5d05ca149 (patch) | |
| tree | 1114d0791470fb4552ff695272856db32746effa | |
| parent | 711c59bc571cf9cddc8c31b11dd924bf9ea95d83 (diff) | |
| download | ffmpeg-b2bb09bcc330156e9d79d7ddfa59f9c5d05ca149.tar.gz | |
avformat/flvdec: delete unused code
Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Signed-off-by: leozhang <leozhang@qiyi.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/flvdec.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index b531a39adc..6bfe6248d6 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -32,7 +32,6 @@ #include "libavutil/mathematics.h" #include "libavutil/time_internal.h" #include "libavcodec/bytestream.h" -#include "libavcodec/mpeg4audio.h" #include "avformat.h" #include "internal.h" #include "avio_internal.h" @@ -1265,22 +1264,6 @@ retry_duration: if (st->codecpar->codec_id == AV_CODEC_ID_AAC && t && !strcmp(t->value, "Omnia A/XE")) st->codecpar->extradata_size = 2; - if (st->codecpar->codec_id == AV_CODEC_ID_AAC && 0) { - MPEG4AudioConfig cfg; - - if (avpriv_mpeg4audio_get_config(&cfg, st->codecpar->extradata, - st->codecpar->extradata_size * 8, 1) >= 0) { - st->codecpar->channels = cfg.channels; - st->codecpar->channel_layout = 0; - if (cfg.ext_sample_rate) - st->codecpar->sample_rate = cfg.ext_sample_rate; - else - st->codecpar->sample_rate = cfg.sample_rate; - av_log(s, AV_LOG_TRACE, "mp4a config channels %d sample rate %d\n", - st->codecpar->channels, st->codecpar->sample_rate); - } - } - ret = FFERROR_REDO; goto leave; } |