Message ID | AM7PR03MB666067B1957EEBE10DFCB1F18F7E9@AM7PR03MB6660.eurprd03.prod.outlook.com |
---|---|
State | Accepted |
Commit | ec5c188b21cb9475b6b8536b3f1f4e32889feeee |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7106038iog; Thu, 23 Dec 2021 01:15:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJz45rrD93nmnzVEkbvfBY9yKR2Qv3rB3kyv2R/l6yujMbxCMrSghmto4JKfUR54NvF8+0/T X-Received: by 2002:a17:906:9b8f:: with SMTP id dd15mr1255457ejc.480.1640250904345; Thu, 23 Dec 2021 01:15:04 -0800 (PST) Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z20si2048405edc.487.2021.12.23.01.15.03; Thu, 23 Dec 2021 01:15:04 -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=Q6tkwbWh; 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 C19D268B181; Thu, 23 Dec 2021 11:14:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2083.outbound.protection.outlook.com [40.92.90.83]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 694D568B16E for <ffmpeg-devel@ffmpeg.org>; Thu, 23 Dec 2021 11:14:12 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ovi/aacSOApL9FAnZm1M2BJGVELKjnFC389So4Fkz2WbnLMeLZa9KObx/atpz3q+zFvSZ+9XSdWRwW9tjj43e8fFTEwJI3e4xsI+TFJm0iajd3D4qnXI1+yXwzH7AOpxeH+ukY5rPTQp8crvdn6K8en8NtLRnrDfApd6YPN6mcKR03kxC0bQ11Tc3VtNvOeGp00pgY9M3ZTVjLw9O5r3DAbV9T7+QjBeof8fAJmckQbvAu036aCq3FWyB3aTRlgApJlS/LYg1gC3svLTsjFpieNKo5HY66x46I0jTzdIg27DRryXBoY9p/MJJvmh/IyZeMrKDBbKb39bqO6vHHLl9w== 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=FmDx/Qx6gkDS6cyPCQ76hAhTbM2Lz6fox4bOaGM2m4M=; b=USDqTTy3NjbNVeAj/NOmpMfEcfFZ9upYXf6Y50jTHUOFss4ptngJlXiQkMCzWGttlgOtrNJbz51jvFo3JH9JhdwFjmGjMlEoxB3w6hsLm1PHhJ7h8vnr4+qqCgUbSr6AdOba/wvLKLo+4lLZ4WixYq8x/dvpM7w1Svbop+brJFx5TuM2cK6Gpz44vR73jrMeDBYX9bV0J56hSyIY+ARAD6F2Pf6ZoUhBp6F8xJLfY7s4T1Eyke9oo6FyvL975KDhVc1Y8SbEwyY+XXUlmS75r4L+JcgGuTMs0qwNUEdcDVoEloIQ6Qp6aHsGrr+hoj7xq6k6rtERFxr6zOK5v6AFvA== 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=FmDx/Qx6gkDS6cyPCQ76hAhTbM2Lz6fox4bOaGM2m4M=; b=Q6tkwbWhDEITOHxTb+8XjJWjQbHkyT2KpK+noylT/pUnmZ8E6UtfYsDJkcK1vjmuaA5Gqn0dUrK6jn6nya6HcZgMOle6oIFw8KMNHgz539i9FHOJQBkWNTav8O/91nQq96S2Hp2fESHS+hkS7TXLCPjZqLAP459Mxzs+Am+17fvXNCAucNOdoa6PzdwsKHcOVTxHX8CJA6z5A576+Y/5j2gX1hzwii0Q/i7lmAeF8CtMNOzIVYix1iID7KWYX2PFKcfWNtWkRcXhMSNlgW3hzcJzYsQl0yk6sNinxxk9tYhqoUiAvb49Pfu1EgGWBuKW6vcei33aV+PMwIxNA3tRIw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5607.eurprd03.prod.outlook.com (2603:10a6:20b:fe::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.18; Thu, 23 Dec 2021 09:14:06 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%5]) with mapi id 15.20.4823.019; Thu, 23 Dec 2021 09:14:06 +0000 From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Dec 2021 10:13:31 +0100 Message-ID: <AM7PR03MB666067B1957EEBE10DFCB1F18F7E9@AM7PR03MB6660.eurprd03.prod.outlook.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <AM7PR03MB66606013F665BF849CE7CAD68F7D9@AM7PR03MB6660.eurprd03.prod.outlook.com> References: <AM7PR03MB66606013F665BF849CE7CAD68F7D9@AM7PR03MB6660.eurprd03.prod.outlook.com> X-TMN: [03BsP+Z9zZjgsyLQ2LHoVr2QRWeH/+c8] X-ClientProxiedBy: AM4P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211223091340.1450013-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8431294e-d21b-45d4-f986-08d9c5f49211 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JSSMNQW296Cik6aBIKVHIQFHluxgrXgzafGgPN5U5Fvuj/vwDRVSxc3qE2jlKkRq8HHjc4LzdnYMgCIV+J3fnU3h+dHHAB4ixbojSfBMgHMP4xG0ZWAh+8z5hxfqUhrnMNvTTpDAOxzcKLP23j8bVQe4MY4kbW8QcYAirhfGppXe2MjVOi/7DbsyXLOTbxCpO05WCVqG+wtJeN+/4s+Esz0/TY5TMMiV8clt08J1IdWz6lWSGLFHzecqeB+7+7xm668dQkT1fYwFWFHqN+nBiu58Vovnl7Fy1RdXCxV3FaWqU00RA86LvnSkpnpxhMJSs1kdfLrdSGC3eCN+SZY8UXZWQqfDKgKJI4DPYMvtyLd7zNOnsv00wqGTwPOuwDwnOHF9C4xC148XJKxehhpBNiiOf9ZJIPuhkGUgb4Ip48h6tYeJ3RG5z6wp5xiL/S0w3lcL93nZBlc19FLGMmyL4XMK51GoCYcIhLDuxzmckw1dk2hCDAXEZhMcpzw6Twcu2U8X+kqWQojiOU9nHXm9CfBwZ9im9SMa8ZDf3v4p9oJQiVtT+A9GS/3VL0cfsAyI+Ir/eaJV3a2sbhDg7oRU3c0yDzYBQc3GIGN8Ugr6ZTqJ7s2DaWWQSfk3ZzAoFOYVjvw4LhSOYoOCDmPRv2PSXcUxqrhHeOsGmvyRyIeu8V/GwvWQ7jfZe3e3zTmpz51x4ah9SibPynHx8asFj3Z8dEChnjBHL7oBYGqhreqHDHIA= X-MS-TrafficTypeDiagnostic: AM6PR03MB5607:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YKkwg1hKXW+ZnPQBcwkHpl9ZlUffw6lPWxILvUHzr2CoZeTPUVsXW7MTdcIiebuRGFdDX5apw7I3UIbGqFe3tlMuITy24CuiwezgnQVMLQNkYXfgnDV4DCC+lV8y5JspSAdlZxqYHTRy+cNGaMtFKN9mYduZbbu4v1rsL8I06x2IAfSd0XmFJeV7FGzHWUrJDj7y0cvUNw2QwMp7GvJ1r39xkI1iseAdptq0+i07xd+6skH6bs8pf2o0bwNm6P3eR9iKg4ctKBDqvz4jRkVcVf7YPqd+dhcIY9OYo8NXWrLV7yPxIZxQvWv1OFrFZXvZ4pFEoaKVsS9VTILbSGL7KMApyCyBFC2VV0NkJ9qOvKkaF0WHB80gZEoBZQaGOdwhdALLZkF3iLfbxwc2F+0NkO89yQF+yLZBxJBbLCLM9dyRHMehR6BpjyFVuTgc6KnCv+Lwva9/Ia0LGFqeYsMhoseQQZesvBT3qXDsYHVHpD5+94q2j3qqRyD5RxJ4C3vkdqul1eTtdYh9DbbOxb3KYoZNgkPMv0l10JZDQM1yLEm9WKhxKwkS5iNufysB+Sle6Fk0Poe+ImodI+Ew5oaV8A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OVYG63IBRWf0cXjg/CG2etk2sNr+QE6DkyREGBpE6WvrX9hVwfVZA7mTd4n4/3S8LlVFE0WBVk6xMB6DZuzRzQfYO37CSKwNXRsdGRu1Awk2JTMRbSBGeFLW94/JLmz4hJQi7eAJkvFtb/yrsB1tmxO4PJpgJI8SmW6KbDgsdCSWNpw2WvKjeUWqNb81ZbjBJsJmX8dPlupw89PdZoJfYxTxQ3f91RW5hlmlMwZdt443fldIH7iSdYOtU8lJGuXN0N+/9pp/ExehO3ht9Rz7cGvQJGkdBB7eHwe+UflUpq0GOJ4W1f9qubzgREULfsoJejCgxoVUNAKa8P85nfOXo6GFenMskvOYuWQm5FGgjQPLqvuseaJQU27FjAvTKq1frUjKJmMkkRzMOqM4sixdxxXrdTnPfvpfUBFATAxwkkRQ0FYx9Jgdfzldg9YeGlKkrsM1/e4GUf8aKN6m34/m5G1L/Aufvv/IfCSPCXAOUVFXPfk3CSzfZeO010/DIVHdZf22KLQAAsvuzMWZmcXg4t6fDMCpV49W9j09vLXZ6YJ0lUPeKmbKzsINTIRtlkL/asqkOy8Qe/sIcqF0QAhrsnWIRuJYe45qJJdOHZE4DoTka7yhxdy5Vwz45Ag3Tunv9Nmy7llgMbmFy0c57VwmfD+/81RQQwDQUqZTWeLIOaryvID0w2y+tGxPhMKYyBak4VRRmzfclm9FPggfZX/0hDdXUFewkB3oMZN8jHVJe+WJIxme+1qr4fnxLrvDQj7E49Q6Jh/ZEkQ4XX1GonzYmdLAsb2E5D6UG3h6jFV4RiWY0qIwh1jlzHLWbE6fS3u9/cPmhjv8GDnpFjon4b4fkm3u3BjLpBo+a8087WfpFyQUWmoxIvZmHBZc9dLOPYSWCQwenYcPSJa4o7aZbmCEVs6h9BZuPRRoSBzZ7+Kh/IM+MteVmaojOi3UXhOGb8RMCsIeqW2hDPZZ2Np7yiI7Og== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8431294e-d21b-45d4-f986-08d9c5f49211 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Dec 2021 09:14:06.5009 (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: AM6PR03MB5607 Subject: [FFmpeg-devel] [PATCH 21/30] avcodec/mpeg12dec: Use %c to write single char X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: tdTKufWkXwgT |
Series |
[FFmpeg-devel,01/14] avcodec/mjpegenc: Use custom close function directly
|
expand
|
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
andriy/make_ppc | success | Make finished |
andriy/make_fate_ppc | fail | Make fate failed |
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index b75b2c9ea2..e7961c1498 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1790,13 +1790,13 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, if (s->mb_y == 0 && s->mb_x == 0 && (s->first_field || s->picture_structure == PICT_FRAME)) { if (s->avctx->debug & FF_DEBUG_PICT_INFO) { av_log(s->avctx, AV_LOG_DEBUG, - "qp:%d fc:%2d%2d%2d%2d %s %s %s %s %s dc:%d pstruct:%d fdct:%d cmv:%d qtype:%d ivlc:%d rff:%d %s\n", + "qp:%d fc:%2d%2d%2d%2d %c %s %s %s %s dc:%d pstruct:%d fdct:%d cmv:%d qtype:%d ivlc:%d rff:%d %s\n", s->qscale, s->mpeg_f_code[0][0], s->mpeg_f_code[0][1], s->mpeg_f_code[1][0], s->mpeg_f_code[1][1], - s->pict_type == AV_PICTURE_TYPE_I ? "I" : - (s->pict_type == AV_PICTURE_TYPE_P ? "P" : - (s->pict_type == AV_PICTURE_TYPE_B ? "B" : "S")), + s->pict_type == AV_PICTURE_TYPE_I ? 'I' : + (s->pict_type == AV_PICTURE_TYPE_P ? 'P' : + (s->pict_type == AV_PICTURE_TYPE_B ? 'B' : 'S')), s->progressive_sequence ? "ps" : "", s->progressive_frame ? "pf" : "", s->alternate_scan ? "alt" : "",
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/mpeg12dec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)