From patchwork Sat Jun 15 17:13:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 13545 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 12AFF449D76 for ; Sat, 15 Jun 2019 20:20:13 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EC43268A74E; Sat, 15 Jun 2019 20:20:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A75568A742 for ; Sat, 15 Jun 2019 20:20:06 +0300 (EEST) Received: by mail-pl1-f194.google.com with SMTP id ay6so109116plb.9 for ; Sat, 15 Jun 2019 10:20:06 -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; bh=8oDx4TZwCJUoPxb4nmEljPdzTX1FIHfMZTSViHn8gIM=; b=iC2QyCrRvhRUcdlzGBeqRvQyhGFTAJK1GgPZEvcX68kmchE+3/xci/UaFbSoZeXNVp WC33PkA+iMVslNgXsXNdQajyYu1mKMDJOxhHQnzR9AQuCFvilXMLApE6cmyF3Tl4FZfI tkMTSq/O3Hixi9OlW3LhqhQGd74kUIeZfsJU5jdI7JqVKraoN2N7VtuxJm5W/CJBfKdC FoTZ3+5dtkIfsuF+TnuwQZEAjb5cYAKAW2WHUpj5CK3gk/S/qIaOj4ouXRmRlAvKFY9l 6tp2iNc7Krr/OOU2s2LhiE7MvMYKiZ8Dyoa74l6blS+PENZv9F17TcBub21IBh2cyFxH sBGw== 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; bh=8oDx4TZwCJUoPxb4nmEljPdzTX1FIHfMZTSViHn8gIM=; b=O9yQHYSrkL4YrbAQD9NET1cTnpHomvW3dechmyDodJr1zZWL6U4XKYNoORsG0JOPqt u1yjZ9bk7mLTERU29uZ2xuijYbrm9+Co7Srdpsk0ffM0m5Q695umxdhZEaBG9LdVijzb ze402A8qGoX+ueOQNSQ1yuaAAgKL58X2d+Tk6fWVRjAzP65oM1VJrh3a9ojGoafHglRy MrCE3aeDU5oxJ5wryKrbZLLqnTskeUE1E7g6M/iRSzdiPw7X3Ncm8XbYjuYCuxDmzUZi BqyknNPBEGeRT/p/lwYbZYfW8KNm4NC6gJVPRG/I0jPbwA53wAx2ogDBlVQg8JDRD2fe ZWeA== X-Gm-Message-State: APjAAAUAexGas01twycXUDCMhM+TDMW8Zk8TlJgV/Tl/zWYTLRUqXPE1 T0gY4bqYW6WoSJhlz7IEiBnJcf+f X-Google-Smtp-Source: APXvYqzW8y71Y5CI2XHF0XOACa64TfVed9tUo3i34b884JqhfZUiPeBUjqEIne+H+Bi34thvFIJawA== X-Received: by 2002:a17:902:2ba7:: with SMTP id l36mr98345339plb.334.1560618831130; Sat, 15 Jun 2019 10:13:51 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id m31sm15421324pjb.6.2019.06.15.10.13.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Jun 2019 10:13:50 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jun 2019 01:13:37 +0800 Message-Id: <1560618818-14485-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1560618818-14485-1-git-send-email-mypopydev@gmail.com> References: <1560618818-14485-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V1 2/3] lavf/asfdec: Simplify the check conditions 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao Simplify the check conditions Signed-off-by: Jun Zhao --- libavformat/asfdec_o.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index 8e7f044..7891b23 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -1165,7 +1165,7 @@ static int asf_read_replicated_data(AVFormatContext *s, ASFPacket *asf_pkt) } else avio_skip(pb, 4); // reading of media object size is already done asf_pkt->dts = avio_rl32(pb); // read presentation time - if (asf->rep_data_len && (asf->rep_data_len >= 8)) + if (asf->rep_data_len >= 8) avio_skip(pb, asf->rep_data_len - 8); // skip replicated data return 0;