From patchwork Fri Dec 3 22:49:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31948 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1296025iog; Fri, 3 Dec 2021 14:50:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJxiJ0UPSh9j4nY2o443IBphAhrgCKIsXmAGoq4EJ9UmZQyi0MwxsmL9uKNeTfsFnym077US X-Received: by 2002:a50:bb2a:: with SMTP id y39mr29760415ede.348.1638571808819; Fri, 03 Dec 2021 14:50:08 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m17si6206428edj.224.2021.12.03.14.50.08; Fri, 03 Dec 2021 14:50:08 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=fezyV748; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4C4F468AE4A; Sat, 4 Dec 2021 00:50:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073028.outbound.protection.outlook.com [40.92.73.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E15868004A for ; Sat, 4 Dec 2021 00:49:59 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dcYq+LwEfOm2Ws2zRHvSgAv0o2bay2tznqWOTQNGHDJK7ralTcSdNaYagR4dTaaSVu5ZXkJ6nRIKXaGrv3CwxxFCZk9U7DBI37vnwlJ6HhFn209QRnX53vtPQsGVmSPq3Kar79ZEMRrEFAMSRkNpQNY6ktvltk87h+9JFNmujKz008aJXsJxrKKKijCbcmclLU2ZoYN/vRdLhW7hACmK3726iliDWy57IyhdDnQCElyfy1SEtQFH1yt6H0fyYDlYFlM9G4a0qt72yFoz5a0+RO7WpyNqofhzdLVsEhj5QVPTP8Fb+Emc9ggoPf76Xo+ch2JZv6LYl9/0SDgUUCh5wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=trlVxDKmjTCZeL91fCVd71HehhJVK34zI4uU6dXKkeY=; b=cx7YgmcMiz6e9PVE68pbU8B3EIV+YNRLRUIfSPyjP1q0fhy9uaEdwVE9D1N2xbcg673+HDmUoMeS6JzyOEytxSG+vIhoVcYGGmnr2PEtppUwT7+10XSR4Y6aCd/K51wGy3pL8eM0nttG/ItZfvEczi2O4FDVZiYRLd6Rlm4ab800W8bUJebWC05fZGxzFKAsb3i7kf7RYPrFRjIqnQB5i0gznzX+zAh0VCjOdtLmPhB0R7K01qngcvRGWW2zZlph9rTXXPA0MusGvkK4GwEA31Ev6M9vwtc9tj+NnwakzbJTXAqDVWamE7uvB1SgEWsbfufpeg413FEEGYXt6zBfHw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=trlVxDKmjTCZeL91fCVd71HehhJVK34zI4uU6dXKkeY=; b=fezyV748mrFZLEzmJYcT0nSnF2Prm7p4LZ+a0LwfZXyzhPH3A4z9d8gsa69c3J8Br4bbgvMwvZdR1Phgy56eTN8BG0D5K2GgLJ4Ip7d9eXFXl2lFU9fS/mDP4+fBAOq8joNRVbFbYuMkfOkfvRexjOTQ2gwehyuStgNWZy14ZYvM61sDNHHx/dXtvZk1YiJaeTqWTB2K9ismlM3CSXSB23HTpCcxjK2okypg2TEn1a0GigAMshv1zNnQijmL0QbIAng6aW/IADzfZ/4Nrq81vekNIhTuFTTH4K/pahbkrA06Z+j++T2ybA/KJOtQ1sOlXHjIvepfqwMm3vd1pebwBA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6328.eurprd03.prod.outlook.com (2603:10a6:20b:141::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Fri, 3 Dec 2021 22:49:57 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.019; Fri, 3 Dec 2021 22:49:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Dec 2021 23:49:49 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [l7IJsYBL4qMrj7wZIK9VV+YyVmaaHN8m] X-ClientProxiedBy: AM4PR0202CA0019.eurprd02.prod.outlook.com (2603:10a6:200:89::29) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211203224949.2008820-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM4PR0202CA0019.eurprd02.prod.outlook.com (2603:10a6:200:89::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.17 via Frontend Transport; Fri, 3 Dec 2021 22:49:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 94710192-5eef-4b64-c44a-08d9b6af3b09 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQtx8w+3h2yNIIsmVb5543qX819EYd04Nvoo8u3pJ1rPSB/Vc24xs7s2+zHLxwZW4CLTiM/iDr3AvXTdH7/L9jgXSL/imydx6pjM8c4E3IFbyvqfWnJS3XVljADBjuEwQDnQTpoerJKSj1W2c25IQYKHJE216pAZew52gbHK3qbl0dKsWQroFneN2FdjrVMEJlSA9aARplR4frQLnTvLjQskoHUvAxnf2uGeVSsRHXf/3sBTreF220tCxUWOwImHjL8+DDb7szkKXkIjy1mUbRnR1spAy5KdQzlKJvajOQDrMamuB10dMNEe2F/Yq/kbmg0TggUvg42GcbrSIuKjkaynDMaxcRXtR98s7/OsJ4IS0ZjgEuxZUJmwBBBJkiTNUqXZrt4kUR3PDCnA/chxjE4hYmmESMYS9M7YJUU6pueGimT4f+ib4jly06fbC8Dx9HQ7EB8dc+xtflgW0rsaRimjh/AM+vQ7pwVT+YEvNEUs5NuZLYGq18Gk06OmXMTjxGYJvy8vfUmNj4HUg4q7QaVdcMJMakXVXBPylHFAq86wmfQMB+nq/BhxeutmMEaSKnCTsHD3nmhM2gypqz1nLu+VJdW+Ug/9uC//N1Y4vkeVRQXgqxlEx6ZNU/WVTIxBz0iJ58xINuG/aCCiHAa9JGH4986keKmQ7cBjA9jVoeHsUj+UJPtgk8Jt4y+PaRT/PnaZErOoxcuzFOOVpeP5qvy0Qp1jdUMC+dUcDqjX5G2A7AkA5hcWSfRv4Uj8+DnAw0= X-MS-TrafficTypeDiagnostic: AM7PR03MB6328: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AIu7q1wcQ47zXqUT31+xl6Ml4kAZsiYjd71ze0zydJ89nuINvFEmip/ZibLnZWCnoqBMZsz0F1kEJpbX7eI9apquGtRc4Dd8wKmyOv7A8rhaiV2kS1qdMVq3YX2E5raM9LjNCPjI1Sz6l5GP7WKOZBsOXvd5c+tbkZAxmqpzSWoBDuBTUlWzQm/e+G7OCAYGIy+RG1PqKy7FNzAZnfU+DoOoFBaFJwbKPO2E3z4HlVOdIzeWMf4ZSyseLLW7sHqb6bC6RIMTdqGyKdsxUGMbfly/whkqZNWPo0j5pTnZ2weoRm40Tc+HqIebziCaFdj1ezRjeiIZ3GhxwuKBU4dGmuPu0v6NT/OneFaPrNZ0KgOjfNZ4jJDPFMr0Y7mW0O16Lp/2YXYqN4bFcOz1gvsTmUPSZOR3i6q4scjPV+ive5fBXwi1eJW977oRy4s9f8W0z5NjmtHvWc5tp/8uI23hFxRvt56x+DR6XHulpgwlAttvV8gQBbsQL4Cd9GfhK2XR5aWgkmh7T2vaOb04QGgLOBY+867/0YxuF6Kmsab/fI70QuwafYrENLzAzx4BfTBw0uyph3Pr9Pt8Q2QjYJ6JiA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: G759ak+X9c2xDoqlnuidUwaJmrvQIVhdUR7/7IuJWEYbHMU6v4+ITQPnSzBN/iYLdlzoN8fg5xcwHuHhTnxPBqHLqp1+6UxepFk4E3voaNTlRCNK0Iq4Dd+SGSp2j2/+e41BUafCz8AGJOo+iYPu3eJRmodA0J8Gr9yjBJciGpqX5UIJ0EUftPQSNfGiiifMS9sR6BWu+DjtG/oAOG8amSRrDkOGULc923fzo9hH4HTJ6wnWWuUZfol+dHOT436XFIuo74DpzbqhAqtRZfpSxwKmWU5PEokigL44Q2CZhgBnh/9Dg8ZOOJZQeZhQ6lExB33g1qvt/rg15LNTKboIACYTJYh+TuuYUMYVfEV6zzEC/0CHm6gWP+4LCPW2fgYskp+0B0t8a7vu2AjzqXfLiy6BKa3nIU4ay+YRGlH5MnKaZEFiwgVfqNllGaExXebNyiCPAi0J49mEqjv8zeZnqSLMD3LldAw0pB0VZFq5mNWSdOstL/a7iiETDV8oSRrOsy8O4U8+EQS+dvph2o7GcFrwCgmQY6LA6YmZuvyat4HaLANsishVADIApv9Nt6NwEOS3bzY+Zbw4zZ2IIf/dYweimlikZR7nRUnAZTLBdJq1steGXU6XPWKBW2WlhFjY6NmoVA8G6w4OpdEk9opl1WaE6UzEgiiLjw1FLIAcp8nk7ig94vxiFEbgUoIJ+NVPAxvvv9C7xwXgLxcfGGwZiRDaSWrpSgHMthhTtOwdtd+XbyKu4vHuAeblMMCsDAiT10B1ofqRBvETpYYNQLTTUvYfvYsAA4G/9bxz5ljhccKddJBdSML4wTpHHegWAezL5ajKWb+YGuHth5hGm0EeVro08X4sL8F+bdeWttCjD2t+TWP4QRUsQZ+pRQQM91HeA4kpIyw3dYJJec4tvB9QuLZkPrZpvpZ/o7V2vnX1rbWs+GOefrVDUpFQFkb2sfkkAioeAQToiaBCJ/kmeEyKAQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94710192-5eef-4b64-c44a-08d9b6af3b09 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2021 22:49:57.7382 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR03MB6328 Subject: [FFmpeg-devel] [PATCH] avformat/takdec: Simplify data->hex conversion X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: dMWlVurJ7gU3 Signed-off-by: Andreas Rheinhardt --- libavformat/takdec.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavformat/takdec.c b/libavformat/takdec.c index 839e3cc781..6bb26683b4 100644 --- a/libavformat/takdec.c +++ b/libavformat/takdec.c @@ -109,7 +109,7 @@ static int tak_read_header(AVFormatContext *s) break; case TAK_METADATA_MD5: { uint8_t md5[16]; - int i; + char md5_hex[2 * sizeof(md5) + 1]; if (size != 19) return AVERROR_INVALIDDATA; @@ -121,10 +121,9 @@ static int tak_read_header(AVFormatContext *s) return AVERROR_INVALIDDATA; } - av_log(s, AV_LOG_VERBOSE, "MD5="); - for (i = 0; i < 16; i++) - av_log(s, AV_LOG_VERBOSE, "%02x", md5[i]); - av_log(s, AV_LOG_VERBOSE, "\n"); + ff_data_to_hex(md5_hex, md5, sizeof(md5), 1); + md5_hex[2 * sizeof(md5)] = '\0'; + av_log(s, AV_LOG_VERBOSE, "MD5=%s\n", md5_hex); break; } case TAK_METADATA_END: {