From patchwork Wed Sep 23 16:47:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 22564 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 AA54244BBDF for ; Wed, 23 Sep 2020 19:48:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7EEA468B60D; Wed, 23 Sep 2020 19:48:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from qq.com (out203-205-221-235.mail.qq.com [203.205.221.235]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72B8468AC4C for ; Wed, 23 Sep 2020 19:47:52 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1600879669; bh=1ogDyyV0YLObAlQHNGma3+popsEaUNxk2mICRZZE9Gw=; h=From:To:Cc:Subject:Date; b=GaBBtixIdJGobjKK2zDa3PMV+LxRkvn82udIdAUG0Q8yv91p+55qquDimZJNfQ8od 9rpUwiAiJ3C4fhhvA8c/rBQ6GPrS5qJhHBXWV4+JrKS5aTGVAr8JPGDAhYtmzBxYeV 8NUvhCUL0YEwqBTfuLsz0NG8CMHMTcpaEVYJPE8Q= Received: from localhost.localdomain ([27.46.80.13]) by newxmesmtplogicsvrsza8.qq.com (NewEsmtp) with SMTP id BF01F6B3; Thu, 24 Sep 2020 00:47:48 +0800 X-QQ-mid: xmsmtpt1600879668twcjgklm0 Message-ID: X-QQ-XMAILINFO: OEmzfgEAEsq8KQzvn4dpRIqOQxQYoS4uAj1+JATzSfz7Blsmrm6Yn0Mb63Y2KY PNfQJ4/HBKXzHtSqhOVeBCVZH8oETzVNGB8zj5aMTRclgyUxK6a8Csx8FmUGKGnYcDCEj+gg1anG Ij2mGhDyQcoPHRn2Jor6YJvLW8UmpqodoMcPf0m+IhCKRgPGhEKvqweMVbnBE+X56KxCVRUaj6qZ 3qn70pBphhM4M3f3ItKwi+IK8ybooeT45XelsHbSNmy8C14geBSz+48IPTjz7YntTQmxMqfFbPWd pT6k4vMxBzCqufzb8SFOvW4XsYCxer3niremz0FVIZrSoouOOthLdGZk4ETSIqr5wQ+lAM6cFW5C eq8ET8cK9wQ+O4wId6Ur2oa0qi0mlB84g1mo7grJDP02NY3nqAM0rLA+dTcoZN/q1YbA6iZKTC2Z 8+uIIw0PchdpRVLQh0lIU6n+X9Cw058bDw400mdAtDf4+XbxsRmEhFdm+1Rm+xBgFudahaHt+Q6i jGcpXLWHS8dkRej9CQRGwr/42W81zTAeY1KDnIT2grtQCxbz2h0TrD4O/I4M+PHOlzGKzLXB/d8F Yzy4yr81w653dLQwJFw8lryz5c8oRWYTiWvPz8/s9AvgxFWTqi3pUJC+zZyieYHbNnX2NI62mR/c sQP9GrNbQ22YlcPbb/bGh1jck061yQcAImRyVZ3oR/FUVUI4+Q36iR0KYw+X74zzR956GxG7dEe1 1FT4IBMkN/lWEVfg2g1RFw+amDqH6sMq+W From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 24 Sep 2020 00:47:46 +0800 X-OQ-MSGID: <20200923164746.149424-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mov: move av_freep to if block to reduce no-ops 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Use the check since it's there already. --- libavformat/mov.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 4f64e96bc0..dcd263b02a 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2909,9 +2909,10 @@ static int mov_read_stts(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_log(c->fc, AV_LOG_TRACE, "track[%u].stts.entries = %u\n", c->fc->nb_streams-1, entries); - if (sc->stts_data) + if (sc->stts_data) { av_log(c->fc, AV_LOG_WARNING, "Duplicated STTS atom\n"); - av_freep(&sc->stts_data); + av_freep(&sc->stts_data); + } sc->stts_count = 0; if (entries >= INT_MAX / sizeof(*sc->stts_data)) return AVERROR(ENOMEM);