From patchwork Wed Aug 14 02:32:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: leozhang X-Patchwork-Id: 14495 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 CB680449C79 for ; Wed, 14 Aug 2019 05:32:57 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AC75368A324; Wed, 14 Aug 2019 05:32:57 +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 B22466883E7 for ; Wed, 14 Aug 2019 05:32:51 +0300 (EEST) X-AuditID: 65e30cac-29bff70000001275-2f-5d5372d08da3 Received: from mail.iqiyi.com (Unknown_Domain [10.11.69.97]) by smg-sh-01.qiyi.com (Qiyi mail Gateway) with SMTP id D2.75.04725.1D2735D5; Wed, 14 Aug 2019 10:32:49 +0800 (HKT) From: leozhang To: Date: Wed, 14 Aug 2019 10:32:45 +0800 Message-ID: <1565749965-164002-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.14] X-ClientProxiedBy: BJ-CAS26.iqiyi.pps (10.11.50.113) To EXCH20.iqiyi.pps (10.16.148.50) X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrBLMWRmVeSWpSXmKPExsXCxe2aqHuxKDjW4NdTXotvn84wOzB6/Fm0 mSWAMYrbJimxpCw4Mz1P3y6BO6Pt90P2gks8Fa/ev2VpYLzK0cXIySEhYCLxrn0BM4gtJLCR UWL6a0UQm01ASWL9iqmsILaIgKzE6n9T2LoYOTiEBewk2meqgYRZBFQl9v99wAwS5hVwkvhx VgZiooLElIfvwSZyCjhLPLx3iw1iupPEm5cNjCA2r4CgxMmZT1hAbGYBCYmDL15AXSAn8fTX LxaIOfISW9fvYISwIyWmXPzAPoGRfxaS9llI2hcwMq1iFCrOTdctztA1MNQrzKzM1EvOz93E CAyk1Mc8a3YwPtvhfIhRgINRiYe3QDo4Vog1say4MvcQowQHs5II74SLQbFCvCmJlVWpRfnx RaU5qcWHGKU5WJTEef/6AqUE0hNLUrNTUwtSi2CyTBycIN1cUiLFqXkpqUWJpSUZ8aAgjy8G hrlUA6NG5sMQ22VhfRvbtA8sfWK1ZXeoxl4zdjfGRR47Yg9OfbpvAlvqrtuBOno7jzGt8d/4 YLn42cWBPPsnPlK+3MA43/CL21dJ10Dr5Iuf/lRWm3zgvdGitfaU4M2Tbl/Ljed8PmuTcMB8 8fFTu702m5wtn7l5ec/6n2/vqastXyho8cNAxPiBvn2uEktxRqKhFnNRcSIAG1rzvjsCAAA= Subject: [FFmpeg-devel] [FFmpeg-devel, v2] 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" 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; }