From patchwork Tue Aug 13 07:06:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: leozhang X-Patchwork-Id: 14479 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 ED0AE44A025 for ; Tue, 13 Aug 2019 10:06:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C10C568AB83; Tue, 13 Aug 2019 10:06:16 +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 8500068A0FA for ; Tue, 13 Aug 2019 10:06:10 +0300 (EEST) X-AuditID: 65e30cac-2b3ff70000001275-14-5d52615c4657 Received: from mail.iqiyi.com (Unknown_Domain [10.11.69.97]) by smg-sh-01.qiyi.com (Qiyi mail Gateway) with SMTP id F7.49.04725.C51625D5; Tue, 13 Aug 2019 15:06:04 +0800 (HKT) From: leozhang To: Date: Tue, 13 Aug 2019 15:06:00 +0800 Message-ID: <1565679960-120520-1-git-send-email-leozhang@qiyi.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.13.42.219] X-ClientProxiedBy: BJ-CAS25.iqiyi.pps (10.11.50.117) To EXCH20.iqiyi.pps (10.16.148.50) X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprILMWRmVeSWpSXmKPExsXCxe2aqBuTGBRrMG+lqsW3T2eYHRg9/iza zBLAGMVtk5RYUhacmZ6nb5fAnfHyzzn2gttcFaevBDQw/mPrYuTkkBAwkZi5tYMZxBYS2Mgo sWWJDojNJqAksX7FVFYQW0RAVmL1vylg9cIC1hI/F91jB7FZBFQlbq+9xgJi8wo4Sbzb8ZgV YqaCxJSH75kh4oISJ2c+AathFpCQOPjiBdQuOYmnv36xwNR/vLmGGcKOlFh+YQfrBEbeWUja ZyFpX8DItIpRqDg3Xbc4Q9fAUK8wszJTLzk/dxMjMDRSH/Os2cH4bIfzIUYBDkYlHl6LfYGx QqyJZcWVuYcYJTiYlUR4L5kExQrxpiRWVqUW5ccXleakFh9ilOZgURLn/esLlBJITyxJzU5N LUgtgskycXCCdHNJiRSn5qWkFiWWlmTEg8I2vhgYuFINjMscL55y2J+w3MjccOOnfbNmcmUl LGGt+nl5p1bhnN2Lqy9FdTps3LHOJ/SytrpQZMTXa0qa5zkS/zPkK91WnCcbX2Q084yXmwT/ 9IX+h9b82MdReyLPKzA+9CPvyuwLpb47oya9vq62Ld93UWt6peFV1fcnWbd9L8/OstHJr9ng +bT0lMDfVUosxRmJhlrMRcWJAFfSbo4kAgAA Subject: [FFmpeg-devel] 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 | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index b531a39..4e8faed 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -1265,22 +1265,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; }