From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id A5B4E4A8F1 for ; Sat, 20 Sep 2025 00:09:07 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'fYZIPgB7r4bqfw7wHhQRyswAOqVL91LUkLA5Irn0IKc=', expected b'DGjt+9eu48y3EpnrzVC60S53KVNDHrh1ri5lU60wUeo=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1758326939; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=fYZIPgB7r4bqfw7wHhQRyswAOqVL91LUkLA5Irn0IKc=; b=s3fTztn9+IM9aPRQiAAlV+D3l9rxCjjonyxYGUedAhLF2FtcxycDnODSsLodRzqK/eGsO Z7X1wRYLU7ae8cMqTTM8wx7khT5LWx6AgKbi0LpABcdhTqmP4dcnnXblirkd5IYG6uRvi0D 5EuOgS+pc92GK7BV1mVoQGKqY9NRuGxb2++lFVMoJTe6kVUCtHW2RBPdcMsZkoOV6rkjE02 EWV8DmuwPX8s4rnTtjD7AYoI7lGJy8nATu7UdPbBpNKp9RpHANYkHns+d7qZhNWwMdgALCd uktKdDyBql/Jc30laFfCDi3WHbG1eJ++ZNlaBULxCJMUgwATmo63K+SBMHZA== Received: from [172.19.0.4] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 3B07468EB25; Sat, 20 Sep 2025 03:08:59 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1758326937; b=mmyVa1gwbeqov1cTlLbzhKoWyw9Im9t/pp51g9sO6chvnycWVadPT2TwLnZ22wcVqzDAd cPOLRBDQTRTvijbqkG4oNRw/1lDr+7C9LXxuGAajUAcfPJ52uFAul6RmwjaYvftAwiOYZ0j mCCBONzxWXhP+LE/eePail/9I3TI9LfTh5InLotcvHB5HAZaDTeCdl29rhU7u7okxxFzfZG gHqjNYgkml/G65rUtUBpB9mTHkNLr2MBnPYpK7t9oqLeRw00iqQPAimRsnzB7wOy7WMgjN/ kzhu/gXIKG89hS6XTA8wpTjft0ARXd6yQpvv4HQVSz7BqXfcGSQglRfne18w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1758326937; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=BOFrsYKZfozGR/0HyhVfxYxUTvOzOVQxnuCnZTEjhkI=; b=svYm9xV0UPj6ACmVC9DMxkwIQq99iRMV6mKdeBaXZXE4oML+Z18fM7K/XKowqJGxD9iU5 KtoNMptsuau2IeQZlNZiukffciZERNObvME1wywpXY6Z+/xzHzi+ugauqVoAXqUMj8DyiPN i723RIGa4CdaRFMLuV6YhjeWXo4exZvYk9AYropbW40LS4k/XJxctNCWcWiWoPtjrmn+HNu 4jTzpiz2fab5mbkA21Xa/f8pZW1eO+axvjDdj7fqJcjeIaqUY3IOsH22uwBG57DWyTPDZ5i KGyiDhU4fj+jTrvEEsJhvWtxSX10k+0DLXLLTER6OprPWKA1QGloa8bzAWMw== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=none Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1758326926; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=DGjt+9eu48y3EpnrzVC60S53KVNDHrh1ri5lU60wUeo=; b=QVZOsBJSDebSSc3ufKt486OXtBO3PxOXxUdR25lCT49fAHkb0SukrKkl5iQulZoSTA4lQ ZSW8vowj2YxmpB69EqJtlxgc7rDXNBOyfzYSitozGHwgMBnxxS0uVuCi3FAq5hIVTN0KPZI 2kxFSpOFopen+O2rt5/iqlcogx0Z+gGxLeOQArvnNZJZDcizW7H5xB8KifbiQs7MRx2UMNf p1uVEJ2nxIJc+xvvV4bcKYaYPgDWRDG+vLShOFfZlxSpRUXyajM20J8EalaMYMiQzVmhByh rFxfM0Hg1q8eskjuE7Z4GKrB7HvDEDPQ5dbKqJd+A0bxZa8TN3iQvBhXAe5w== Received: from ed19c606a818 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 8A77368EAFD for ; Sat, 20 Sep 2025 03:08:46 +0300 (EEST) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 Sep 2025 00:08:44 -0000 Message-ID: <175832692680.25.9462233820252835352@463a07221176> Message-ID-Hash: IE6LNLPOYYCDOGAGZ32XY3SRJOZQURIK X-Message-ID-Hash: IE6LNLPOYYCDOGAGZ32XY3SRJOZQURIK X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avformat/dhav: Factrorize some code in get_duration() (PR #20560) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: michaelni via ffmpeg-devel Cc: michaelni Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20560 opened by michaelni URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20560 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20560.patch Signed-off-by: Michael Niedermayer >>From 798c4c50d53a01eb24f172575869738c9e26d93c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 20 Sep 2025 01:56:20 +0200 Subject: [PATCH] avformat/dhav: Factrorize some code in get_duration() Signed-off-by: Michael Niedermayer --- libavformat/dhav.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavformat/dhav.c b/libavformat/dhav.c index 21c9c530d6..e28631770d 100644 --- a/libavformat/dhav.c +++ b/libavformat/dhav.c @@ -242,7 +242,7 @@ static int64_t get_duration(AVFormatContext *s) int64_t start_pos = avio_tell(s->pb); int64_t pos = -1; - int64_t start = 0, end = 0; + int64_t start = 0; struct tm timeinfo; uint8_t *buffer; int64_t buffer_size; @@ -250,6 +250,7 @@ static int64_t get_duration(AVFormatContext *s) int64_t offset; unsigned date; int64_t size = avio_size(s->pb); + int64_t ret = 0; if (start_pos + 16 > size) return 0; @@ -284,17 +285,12 @@ static int64_t get_duration(AVFormatContext *s) date = AV_RL32(buffer + (pos - buffer_pos) + 16); get_timeinfo(date, &timeinfo); - end = av_timegm(&timeinfo) * 1000LL; - av_freep(&buffer); - - avio_seek(s->pb, start_pos, SEEK_SET); - - return end - start; + ret = av_timegm(&timeinfo) * 1000LL - start; fail: av_freep(&buffer); avio_seek(s->pb, start_pos, SEEK_SET); - return 0; + return ret; } static int dhav_read_header(AVFormatContext *s) -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org