From patchwork Sat Jul 11 08:04:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 20956 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 13A6F4499B2 for ; Sat, 11 Jul 2020 11:04:57 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E448D6880F6; Sat, 11 Jul 2020 11:04:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgau1.qq.com (smtpbgau1.qq.com [54.206.16.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E860C688036 for ; Sat, 11 Jul 2020 11:04:49 +0300 (EEST) X-QQ-mid: bizesmtp4t1594454669t179cwgok Received: from localhost (unknown [103.107.216.232]) by esmtp6.qq.com (ESMTP) with id ; Sat, 11 Jul 2020 16:04:28 +0800 (CST) X-QQ-SSF: 01100000002000Y0ZXF0B00A0000000 X-QQ-FEAT: DoD8xN2rKoz+4STLYuofQMdUS6eR+xwfjrbqyCuntb6W78w1iYtHPTP4XJ6j8 C/Slg6Al4V++LWLJ5sr2pLho/cbZ/8aLp/9VvPH0woBQwC0H9MH8I0MtgDn5JlUcBrjJvU0 KO8w3iGTdmOqbPU4sQe5/HX8zzPauBR8PMtT0vExQU99JdCxhPaUeEPePRZym1ajg1oe3eo h0kPK7/+H0/RGcG2mGVDQf9C21QMbEbd0QQHZ/ql3jR43z8KLdRxXu6mZc/GeS3BMv1RT1Y 39GD275zSxplmk4pe7+7Y/35sY7PfdpJ6MlL0YdUguczGdqDzJN6DOA9w= X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Jul 2020 16:04:26 +0800 Message-Id: <20200711080426.32692-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign5 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/crypto.c: remove unnecessary code 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: Steven Liu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Because the newpos variable is set value before use it. The newpos variable declared at the head partition of crypto_seek. Signed-off-by: Steven Liu --- libavformat/crypto.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libavformat/crypto.c b/libavformat/crypto.c index 31f9ac0ab9..daa29ed501 100644 --- a/libavformat/crypto.c +++ b/libavformat/crypto.c @@ -252,21 +252,18 @@ static int64_t crypto_seek(URLContext *h, int64_t pos, int whence) case SEEK_CUR: pos = pos + c->position; break; - case SEEK_END: { - int64_t newpos = ffurl_seek( c->hd, pos, AVSEEK_SIZE ); + case SEEK_END: + newpos = ffurl_seek( c->hd, pos, AVSEEK_SIZE ); if (newpos < 0) { av_log(h, AV_LOG_ERROR, "Crypto: seek_end - can't get file size (pos=%lld)\r\n", (long long int)pos); return newpos; } pos = newpos - pos; - } break; - case AVSEEK_SIZE: { - int64_t newpos = ffurl_seek( c->hd, pos, AVSEEK_SIZE ); + case AVSEEK_SIZE: + newpos = ffurl_seek( c->hd, pos, AVSEEK_SIZE ); return newpos; - } - break; default: av_log(h, AV_LOG_ERROR, "Crypto: no support for seek where 'whence' is %d\r\n", whence);