From patchwork Thu Feb 18 03:42:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25737 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 153B944BC26 for ; Thu, 18 Feb 2021 05:43:07 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0535A68A17B; Thu, 18 Feb 2021 05:43:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C2BC68995F for ; Thu, 18 Feb 2021 05:42:56 +0200 (EET) Received: by mail-wr1-f47.google.com with SMTP id u14so1169404wri.3 for ; Wed, 17 Feb 2021 19:42:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=3A/lhzy6IvHqgedPRdvYBjzoYja8tPGcclsEVMVjTzQ=; b=A1aYbliDLqZ6TUu7bvSXyqAB74GhY1TIfh8pUayd4xX3qZa17leE/rCkmZcMqk8MtJ szEqKWuenrOvuKbIL4t4FVYr0XtTiRt+Qx2P48M+NbAqKEN9zorGxYx7q3F+FY9rnVmU U48VF8eFLHG9qfkLrMXTGivIxyVJKrkR74TJuV0dPsFZljIFqO7PcPQYV9F2F374NVHU ZRg7C4pRDDE6wzxCuTzUSiKtqN8lQn52ic1fyO8oHnRdE64VrA7Jui2VboBQbNYeiJBV KtHx2ORAbj2W9vMt73gL4prf+A6PYwJhLNAhkeEN15B9vGSnbWOvYUSjfUp1gz3H2uYw F9GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=3A/lhzy6IvHqgedPRdvYBjzoYja8tPGcclsEVMVjTzQ=; b=rIxPxrRcGcIZ7TvYrM6+Hs53KkX6O4Zql/ExvPCu0flv89L+4TCPjFKtMJo63WxbVd rm43kk7nX89ZHBwmRdaHCwIrwK3Wb9rHSOtoHvN3gjpSt9SK/OGRY7Tf6F3ADZyWiIxq tK6hbw//yIr9fjCO0niNMuwHdlolaQ+e5bt+I6BTvF7j+FcLDAsFCxDW94wctbr2PJdL 4MfJi66+4NweMQ4e0MOe/4wyo3EyLqo3xOqPY2n+Zhy/k9jfwdMx0JvI1xTbawomDRuX mPH+ItVTTEca8GQXLwpdb6d68qfEuUddA3bmTj5yUKEBeFM6Ss7op8eLVfyhzCSjdMp7 8QgA== X-Gm-Message-State: AOAM531QnYoOS5Eh4oP77rWgCcPoPKpkuvpabgflZE46dybCJlQSSwzM BTjWCNJqPcTysmArLXwn2wi2gISpQ68= X-Google-Smtp-Source: ABdhPJzSjparAjy9fuQvGTOs0tWgW9JsvPhMBOdEX5sWYEzFIkplnLpgD75gevpNAVPzkwUiL2LXeQ== X-Received: by 2002:adf:8545:: with SMTP id 63mr2110999wrh.128.1613619775465; Wed, 17 Feb 2021 19:42:55 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id p9sm5643855wmc.1.2021.02.17.19.42.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 19:42:55 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Feb 2021 04:42:01 +0100 Message-Id: <20210218034214.2090223-16-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210218034214.2090223-1-andreas.rheinhardt@gmail.com> References: <20210218034214.2090223-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 16/29] avformat/isom: Remove outcommented function 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" There is another ff_mov_read_chan in mov_chan.c. Signed-off-by: Andreas Rheinhardt --- libavformat/isom.c | 39 --------------------------------------- 1 file changed, 39 deletions(-) diff --git a/libavformat/isom.c b/libavformat/isom.c index e0e50f71b1..df98779149 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -418,45 +418,6 @@ static const MovChannelLayout mov_channel_layout[] = { { AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY, (137<<16) | 5}, // kCAFChannelLayoutTag_DVD_11 { 0, 0}, }; -#if 0 -int ff_mov_read_chan(AVFormatContext *s, AVStream *st, int64_t size) -{ - AVCodecContext *codec= st->codec; - uint32_t layout_tag; - AVIOContext *pb = s->pb; - const MovChannelLayout *layouts = mov_channel_layout; - - if (size < 12) - return AVERROR_INVALIDDATA; - - layout_tag = avio_rb32(pb); - size -= 4; - if (layout_tag == 0) { // kCAFChannelLayoutTag_UseChannelDescriptions - // Channel descriptions not implemented - av_log_ask_for_sample(s, "Unimplemented container channel layout.\n"); - avio_skip(pb, size); - return 0; - } - if (layout_tag == 0x10000) { // kCAFChannelLayoutTag_UseChannelBitmap - codec->channel_layout = avio_rb32(pb); - size -= 4; - avio_skip(pb, size); - return 0; - } - while (layouts->channel_layout) { - if (layout_tag == layouts->layout_tag) { - codec->channel_layout = layouts->channel_layout; - break; - } - layouts++; - } - if (!codec->channel_layout) - av_log(s, AV_LOG_WARNING, "Unknown container channel layout.\n"); - avio_skip(pb, size); - - return 0; -} -#endif void ff_mov_write_chan(AVIOContext *pb, int64_t channel_layout) {