From patchwork Wed Sep 18 03:26:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15129 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 025CF449FBC for ; Wed, 18 Sep 2019 06:32:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E0F2E6897CD; Wed, 18 Sep 2019 06:32:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 563306881D6 for ; Wed, 18 Sep 2019 06:32:33 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id v17so683812wml.4 for ; Tue, 17 Sep 2019 20:32:33 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=muUdlg0H0VZBMetEV7aPG/C75uhDGdBYg5ZRnwU3OSM=; b=RJUnA7rU0gb5Ix5Hi62jrlQN6wFvyarNanz4JEUaxr24koacXZRlikLUxpIoQOzj4x TglgiKYrSY8qQd3mCv8zCmqWe9AsMUg9ljbmnjXv0DyKkpRH8VgbFBG+pX635dqxkRwk m+gYTssQCvBnk0lFM+zdKqaCn9pYlFtTsogxeS76a+WGgdW9j3U50uKVU7GHhDRY9/au SVJQYCOW5JqaQ7oxzVnR6mHq/B4iOjc9bt2DoW+muoy5w6AqYU7PzK9mO3Q0cDE0/Csz jQGsjOGHAs8BcbxO8rbtw9YdgZUVSrlht6kwF+rLRSDCHVscu4PceMfsOip25KvH2HG6 d01g== 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:mime-version:content-transfer-encoding; bh=muUdlg0H0VZBMetEV7aPG/C75uhDGdBYg5ZRnwU3OSM=; b=J1L/wgIqJqEfcAfpQ20L54kbC5gkkWfqvl+cGwDj48SBpjfdpnQENwYyCS/oXQTJaS NU6eXK3nQXNlmVCiJ/wc3+/gNM1YWRBvG3b6q/Glchs+Na1SPDoAxB8f7DXpKDXWcKCR vaPc+dS+v+0BgTwrCZsKsV6Ny7lk/BbCF8Cf23RyU9EEyznjJEFxS6k7ErrnWE+Kr4Pk p5/N+TFSvMJUWihtmIn2kYy+AApY8mOD9F5+kDOnah/ZNNNgJPZD/Gzh7VHfipw7aGTw rmCHRCRju6uNBjVqRm/ZztWev+tx/rEPJrwBxxDx1doBCl5Mu+vOKYUb9p61Yu5RiLUh Te5g== X-Gm-Message-State: APjAAAXCWJrhrvy+pRjwGEQk4qSOOMmuomjx6FDxNbzUmrYV71P2/2aB Bwmi+Rfh/X2sRyC+aHFeQZFTgr9kF08= X-Google-Smtp-Source: APXvYqw+1AVczVTEvc5G2+WCjHinnBiST62mXeroC2joQm9bMTjAJlJTsOQFnT+lU5sPT4FiIsNp8w== X-Received: by 2002:a1c:e906:: with SMTP id q6mr767831wmc.136.1568777552619; Tue, 17 Sep 2019 20:32:32 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc0f857.dynamic.kabel-deutschland.de. [188.192.248.87]) by smtp.gmail.com with ESMTPSA id 189sm806891wmz.19.2019.09.17.20.32.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Sep 2019 20:32:32 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Sep 2019 05:26:02 +0200 Message-Id: <20190918032607.11774-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190918032607.11774-1-andreas.rheinhardt@gmail.com> References: <20190918032607.11774-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/10] avformat/asfdec_o: Unify switch cases 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" Found via PVS-Studio (see ticket #8156). Signed-off-by: Andreas Rheinhardt --- libavformat/asfdec_o.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index 8e7f044ce9..26f9609f27 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -316,6 +316,7 @@ static int asf_read_generic_value(AVIOContext *pb, int type, uint64_t *value) switch (type) { case ASF_BOOL: + case ASF_WORD: *value = avio_rl16(pb); break; case ASF_DWORD: @@ -324,9 +325,6 @@ static int asf_read_generic_value(AVIOContext *pb, int type, uint64_t *value) case ASF_QWORD: *value = avio_rl64(pb); break; - case ASF_WORD: - *value = avio_rl16(pb); - break; default: return AVERROR_INVALIDDATA; }