From patchwork Wed Aug 14 03:07:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: leozhang X-Patchwork-Id: 14496 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 13F57447F0E for ; Wed, 14 Aug 2019 06:07:32 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E71CD68A7D2; Wed, 14 Aug 2019 06:07:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smg-sh-01.qiyi.com (unknown [101.227.12.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F51868A324 for ; Wed, 14 Aug 2019 06:07:23 +0300 (EEST) X-AuditID: 65e30cac-2b3ff70000001275-46-5d537ae972e1 Received: from mail.iqiyi.com (Unknown_Domain [10.11.69.96]) by smg-sh-01.qiyi.com (Qiyi mail Gateway) with SMTP id DE.C5.04725.9EA735D5; Wed, 14 Aug 2019 11:07:21 +0800 (HKT) From: leozhang To: Date: Wed, 14 Aug 2019 11:07:18 +0800 Message-ID: <1565752038-86411-1-git-send-email-leozhang@qiyi.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1565679960-120520-1-git-send-email-leozhang@qiyi.com> References: <1565679960-120520-1-git-send-email-leozhang@qiyi.com> MIME-Version: 1.0 X-Originating-IP: [10.49.22.13] X-ClientProxiedBy: BJ-CAS26.iqiyi.pps (10.11.50.113) To EXCH20.iqiyi.pps (10.16.148.50) X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrFLMWRmVeSWpSXmKPExsXCxe2aoPuyKjjW4Ptda4tvn84wOzB6/Fm0 mSWAMYrbJimxpCw4Mz1P3y6BO+PFnwfMBW28FTsWFzYwNnN2MXJySAiYSOz8sIe1i5GLQ0hg I6PE3YPz2EESbAJKEutXTGUFsUUEZCVW/5vCBmILCxhKTO/9ywJiswioSly7cxEszivgKDFh 82wmiKEKElMevmcGsTkFnCUe3rsFViMk4CTx5mUDI0S9oMTJmU/A5jALSEgcfPGCGaJGTuLp r18sEHPkJS7MXcIGYUdKTLn4gX0CI/8sJO2zkLQvYGRaxShUnJuuW5yha2CoV5hZmamXnJ+7 iREYTKmPedbsYHy2w/kQowAHoxIPb4F0cKwQa2JZcWXuIUYJDmYlEd4JF4NihXhTEiurUovy 44tKc1KLDzFKc7AoifP+9QVKCaQnlqRmp6YWpBbBZJk4OEG6uaREilPzUlKLEktLMuJBgR5f DAx1qQZG69/fk9wi+KON72nOvZr3vXf3m8QSpf/va44Y5jY9bZj49XvDh+5OFfYl1llspUpd gZ4/F8v5LLiuWlT2Xn9xQelcpnLj3/Gfl1jqBYYcOZNkeXS5fsDLOcHNG+9mLT37reRDw7rJ uzMmHPqoJGz/3Nhdpr9q6u0ojTOF044zh0Xs89756IurEktxRqKhFnNRcSIA4S/8oz0CAAA= Subject: [FFmpeg-devel] [v3] avformat/flvdec: delete unused code X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Reviewed-by: Carl Eugen Hoyos Signed-off-by: leozhang --- libavformat/flvdec.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index b531a39..6bfe624 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; }