From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by master.gitmailbox.com (Postfix) with ESMTPS id 3722540744 for ; Wed, 22 Dec 2021 15:39:36 +0000 (UTC) Received: by mail-pg1-f178.google.com with SMTP id v25so2430723pge.2 for ; Wed, 22 Dec 2021 07:39:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=PlRxvfDB5z/c1ajK8lfAknF7MPl5TLADaHUb2BzUUxo=; b=oRvdVu+ff+Z6HSncgFGgyGm9HS1a4jr26bFNzWl+xcY8oYc5O1z4G2sHmw6nGjuDMG Ys/qUjaTTtNhlicxdnCDzfPcfhk4J4SKpXR/ffdNy60kSQXZjdHaNpnpwwyqWtoVPbJx 8IKe2jnkJ2BQ1jFv4+vnrUXNZcXTcSJ+sgNIXBi9mXRlq/xAJqajYCEUqR32Le5aNVAB oeu5C/XWGrrewjNawy09ddh8+8AKvtZJP6Veto5LB0zW0D+Al1zOEz0VKXoCxHTySS4h zMiHzwQOhRRdY24XkMZocsqodBGPNG9U77e2m7CQRXQlNm4RflcosxgygOAbgr5sejhU PEzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=PlRxvfDB5z/c1ajK8lfAknF7MPl5TLADaHUb2BzUUxo=; b=eFODtnXqzn5YoT8EasQWz+dXQ/pjd/luE/LSRfjWhtNy0RHiX9f6UkFEIGiLNmRyvo S8WWzmQZYvvKnP1eh7yLIzw7/V9fyXtJQe2iKw0goDz+MmUrY/MNrLzrsbCtfGa9z5ij /9aeh63qMKpZropRULXNVZVjOW3kD0VOj+6KdFZIfRXl7kTcxEYKdHCa6QPmrP2ypubW wJmeA63XoRuR/eTwDJfozNn84uH4Yd7Z21l3VrBYEbM6XvByYt9LWkHCQ21EfFbXdaKk hXJdT1y8o+U9L2ShZiA2IvuM4zym0T3iEBDI2krK8OjdSgQRZHrGc1949Zkyc5NHAoom LXkQ== X-Gm-Message-State: AOAM531Qhn+KPvg9tIoTXXjR91m62SCyVoFuurujVemi0qmqVpPpZwRV M6UafzZzmVr8/C8JtAsrTny67ol55sXiYLHv X-Google-Smtp-Source: ABdhPJz+sEL8YVumrsC5JjOdaEBcD9Q58NWbDN+P8Vzm7qfjY7Jbrf05oia8yCWyLBO7pPPoImDCXg== X-Received: by 2002:a63:4d17:: with SMTP id a23mr3014521pgb.179.1640183595274; Wed, 22 Dec 2021 06:33:15 -0800 (PST) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id y12sm2724371pfe.140.2021.12.22.06.33.14 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Dec 2021 06:33:14 -0800 (PST) Message-Id: In-Reply-To: References: From: ffmpegagent Date: Wed, 22 Dec 2021 14:33:03 +0000 Subject: [PATCH 07/11] libavformat/asfdec: fix macro definition and use Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: ffmpegdev@gitmailbox.com Cc: softworkz , softworkz Archived-At: List-Archive: List-Post: From: softworkz Signed-off-by: softworkz --- libavformat/asfdec_f.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index e87c78cd6c..a7b5ffe465 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -896,21 +896,21 @@ static int asf_read_header(AVFormatContext *s) } #define DO_2BITS(bits, var, defval) \ - switch (bits & 3) { \ + switch ((bits) & 3) { \ case 3: \ - var = avio_rl32(pb); \ + (var) = avio_rl32(pb); \ rsize += 4; \ break; \ case 2: \ - var = avio_rl16(pb); \ + (var) = avio_rl16(pb); \ rsize += 2; \ break; \ case 1: \ - var = avio_r8(pb); \ + (var) = avio_r8(pb); \ rsize++; \ break; \ default: \ - var = defval; \ + (var) = (defval); \ break; \ } @@ -993,9 +993,9 @@ static int asf_get_packet(AVFormatContext *s, AVIOContext *pb) asf->packet_flags = c; asf->packet_property = d; - DO_2BITS(asf->packet_flags >> 5, packet_length, s->packet_size); - DO_2BITS(asf->packet_flags >> 1, padsize, 0); // sequence ignored - DO_2BITS(asf->packet_flags >> 3, padsize, 0); // padding length + DO_2BITS(asf->packet_flags >> 5, packet_length, s->packet_size) + DO_2BITS(asf->packet_flags >> 1, padsize, 0) // sequence ignored + DO_2BITS(asf->packet_flags >> 3, padsize, 0) // padding length // the following checks prevent overflows and infinite loops if (!packet_length || packet_length >= (1U << 29)) { @@ -1056,9 +1056,9 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb) asf->stream_index = asf->asfid2avid[num & 0x7f]; asfst = &asf->streams[num & 0x7f]; // sequence should be ignored! - DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0); - DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0); - DO_2BITS(asf->packet_property, asf->packet_replic_size, 0); + DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0) + DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0) + DO_2BITS(asf->packet_property, asf->packet_replic_size, 0) av_log(asf, AV_LOG_TRACE, "key:%d stream:%d seq:%d offset:%d replic_size:%d num:%X packet_property %X\n", asf->packet_key_frame, asf->stream_index, asf->packet_seq, asf->packet_frag_offset, asf->packet_replic_size, num, asf->packet_property); @@ -1134,7 +1134,7 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb) return AVERROR_INVALIDDATA; } if (asf->packet_flags & 0x01) { - DO_2BITS(asf->packet_segsizetype >> 6, asf->packet_frag_size, 0); // 0 is illegal + DO_2BITS(asf->packet_segsizetype >> 6, asf->packet_frag_size, 0) // 0 is illegal if (rsize > asf->packet_size_left) { av_log(s, AV_LOG_ERROR, "packet_replic_size is invalid\n"); return AVERROR_INVALIDDATA; -- gitgitgadget