From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 0F2FA4212C for ; Mon, 28 Mar 2022 23:25:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2AA8368B2CB; Tue, 29 Mar 2022 02:25:53 +0300 (EEST) Received: from mail-oi1-f181.google.com (mail-oi1-f181.google.com [209.85.167.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C85668B2BB for ; Tue, 29 Mar 2022 02:25:46 +0300 (EEST) Received: by mail-oi1-f181.google.com with SMTP id q129so17377875oif.4 for ; Mon, 28 Mar 2022 16:25:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=UzILGD5CBCFZsMjnd3TYtFeM+idjVVzp3NqGyawluwc=; b=jGG7W0zJ9sS2a+7o8N082+CZswVy2acpuf4ZwYntToJxxqNn1V5aHmqe00SvhLlpjt G0Q2WxMwEgrHBGZom+q2ec/PchCnNKxCkct17rkFsxQSt5VcM1KDfOngxXQoJmSujE6r VU9EydQklq24KdTbEmS5Vq1sEsJYkArPUHKYaFwekqlEP3vwlMcLfqnCtQB4HnseAUmv eeaQJGhyjhuwpt2xMndRGLxgY5WbOyOVqJP9DOmSEn+RpO4d/Ero6+U5uymU6ZgRNTrq o0Z9BMMgbv+ph85xP1ruJ8L5vDVy7pseU/x0UX8y0g/tg+ldv+toTrP7eFbuBcJ/A9cV sC/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=UzILGD5CBCFZsMjnd3TYtFeM+idjVVzp3NqGyawluwc=; b=4pXovh6pfZTLDWDLeti/VVr7NZc8sFeDncjKHon9j2IP0BQ2wJ6bhNM2kwNPb1a4l2 xOty3Po9P0a7yzUCoTIZ/mDCO9yTBcoxeQ3utNAA3wCqeBJZUTN0tEv3MjNr7lHuwPUF 8do8jBLq6xic5d/RCn+E+lPGK6ZMtr+rApP4ADgn432dVGCwKb61hyNA6d6qVfyOw1l9 /TH86mKQw/FqaGBkemqdRfsnf1eQG6drzSFRbtL9I1cH0G+nXynBR0DDE9waypT3Djkh T+92svfAAIQmDCw00i3obJkrTd9UeqAQ79yK093J+mS3wqhQzLOptBBkIpO8L4e9uD1p ychw== X-Gm-Message-State: AOAM5311a1VMJmfIRC3BHU+I8YrZqMBvIehwf6qRdq1LplUxy2T6iPy6 rs9N2339QtK2FHs46utNkavU4VarWZWEkA== X-Google-Smtp-Source: ABdhPJx2sMJ9UVQFu+8xGHEQpzqvWEi+xD5pthkbutOrLcSZrVzaDRKRV6W5wIFOGu/K6e7Pwz2Xiw== X-Received: by 2002:aca:3e41:0:b0:2ec:f51d:946 with SMTP id l62-20020aca3e41000000b002ecf51d0946mr848159oia.138.1648509944536; Mon, 28 Mar 2022 16:25:44 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id gk6-20020a0568703c0600b000de4880b357sm7198456oab.50.2022.03.28.16.25.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Mar 2022 16:25:43 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Mar 2022 20:24:47 -0300 Message-Id: <20220328232453.54773-1-jamrial@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/7] avformat/mov_chan: rename mov_get_channel_label() to better reflect its purpose X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This function turns a mov channel label into a lavf native bitmask. Signed-off-by: James Almer --- libavformat/mov_chan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index f52239d347..4607540297 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -485,7 +485,7 @@ static uint64_t mov_get_channel_layout(uint32_t tag, uint32_t bitmap) return layout_map[i].layout; } -static uint32_t mov_get_channel_label(uint32_t label) +static uint32_t mov_get_channel_mask(uint32_t label) { if (label == 0) return 0; @@ -590,7 +590,7 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, avio_rl32(pb); // mCoordinates[2] size -= 20; if (layout_tag == 0) { - uint32_t mask_incr = mov_get_channel_label(label); + uint32_t mask_incr = mov_get_channel_mask(label); if (mask_incr == 0) { label_mask = 0; break; -- 2.35.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".