From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D5EB54AA6B for ; Wed, 8 May 2024 10:13:20 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6A55368D627; Wed, 8 May 2024 13:13:17 +0300 (EEST) Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02olkn2094.outbound.protection.outlook.com [40.92.48.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9A3968CBEB for ; Wed, 8 May 2024 13:13:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b2rAWZZHPG18IJIZuGwgyfrdc2bf7Mhq+oR9qAPE0LnsaXfDjGocfZqKdxbpW9GRlFxmTlfMWpQexNRMPjVsQBwlrZVo1DyVIVLQXmB/j38QcKG4XpwAkpVpIfqJAq7Xim9+7vq6UfOor19XLrWmmaQ/tMWqJAfTC2joRqKn0G2SC/XrMDqMT3cDCxwETOflLUH7nAplolXabIu6y1t9+6MCmcnMiPpa6W341BPm2temsD1IkFgAPcVlCZdsWEcwObdX0zbsBi/kOk/hgecy7Hni30Sl9hnrTGP+uMRlqjKpDjlDwtrTxfGIMmOLqD6lToffw0CHNCnLna+WMRi4Ww== 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=e60UcKrYI23rKbR3bcDrseLaAqjPv8JR7iP2t4EcT6o=; b=jsOcqCoEZoNlctRQTdfuIRhkutTURqnhXg0l6WomoZfYu2WATvDBDW8SnTxVBpPoaV54mmWgxUQouc53BmFLYSDAbyWIoxonYLGs5H91sWyPBZrJg9FcVQcurRp3Z8amDcZw+dALH3s0oc2wUzgu1wENKeb/5DZxFhEFdXS98Hd//RUxzANZEAw+tBmroLNxUB1qPVmBJ0OHVbYgo8ovj90ab33ChL1/MIocrwCDV3s1JN4RihzSuFPusyiB+h/VmChHUisiJ9EvHjbvoY0Ld1BKpusZz6NkAwC1+HwTlWrs8n+wBEOOOJvR0x1hM9nh7iGw1hy7/eLxvqUWU5yaeQ== 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=e60UcKrYI23rKbR3bcDrseLaAqjPv8JR7iP2t4EcT6o=; b=uhfsd00/ZipJ7xbI6RR5pPB/27/JsqmOMXfzlhwYkymCfsxkutMZxacNgnT/9Pz4I6rb7uhmBIo+xhy1KrfyRN0J9bWpsOyXYAlrKVX+tkon88xDKdKo7i9+Tyyx8QGuIhebstLot8GguRALDbRdYAOBGBus15+oHzULRzW3gbb+6n3TnBM9SB0rRULZ7zdtEjpOTN19z/G7JEeK7aToivcImxUTTrXvQ8IKuWc1yXH/QJk47+1jxdEMAlCw8SY+uVS8ncifKLovt0icM7LpToYQcFIDsDH3+1gkNjCs32PSzQBh6Ox7bZOV3wAhOMnGktPFEMSzEWrBsJzvokcQmA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0216.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:327::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.45; Wed, 8 May 2024 10:13:09 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.041; Wed, 8 May 2024 10:13:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 May 2024 12:13:00 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [mptMlFjCAHpfAYklSLjQRfqSJN/unKsW52h7YwPwpsI=] X-ClientProxiedBy: ZR0P278CA0084.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::17) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240508101300.2289942-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0216:EE_ X-MS-Office365-Filtering-Correlation-Id: 1a2177ea-c256-48b8-4171-08dc6f477576 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: WyLoRR3NR9KWVmMoRWQxgq74t6VF1nvxUfXC6+PXxy3cYPZB5IDMPu+P4L30bb0g10Z92SGm4WBZvtwIpr5dkBTOUb335JWHnK6/7CeYGFaJr45pqBsTbaVLX0mfRei6f1fsoH3vv352FnJArsEUPm+/QbwVqNMBFyPJHEs9twN1KHhrzcMR7Y449ZCrAjjpLO3PK9odmcPv253nXAzRK/f7lu/vLdQe0DQEa7HRh155G3GIPGS6ocnjtiIZGv1RiTnuvaJz+oL9tCGRy5hMMtQtxyPeO8epxMWUvGdp9fFYgTBBR/HfYrGnxDNT5EjmTH3KcWANDxDCFCbrls59VQL+Ir0viN/398vWb7OSMqYSSFPp4dkDsYCfODjaIm/lQCY+V2R4CzwRa+MONfDP1EAPISbD7S7BTf4lDmIK8L9w/6KMusEmwXO22gghSq6dbYIuDnLnH2nk/Haco3FTP57DAarLwa9ej70zT+0KkM3SSOZKm6tP2xUvKI2Ux7jvb+EmM3Dz5hVDpsmhEg4i7bD0QgSgK3IuadR+PBE53IzRKXM6mtF2rCSp/Wvm6ZAGxeOQIBhobEsowFem1T1IERuVQsgZJsMIQb5mZHaOIjFkUToZ63gAKkIF8J2O8Rom X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?pclCJnfB2jYrCOK0kxx80uA2DLUSg/ElMEHtCngMHHVeikYp+ORcUpmhJn7z?= =?us-ascii?Q?K/dWSv0D5/ro4q+z9kKSKiE7M2mQbXgCMP23A0HxKY1xhQfNJDPI3EK68MB8?= =?us-ascii?Q?W+3ilMOEf3TnKnSpW6NFrgkXFy+AxiS8AwGW1+A4zU2jZGL+hNOTQiv+YXMu?= =?us-ascii?Q?yauK5+/SrKjDikXWGZMlPLqLL/ntBntG3jhJp96t2TXsce4NyrBNRWbhoGyf?= =?us-ascii?Q?tl7LWZrkEPe3jX3it9xd9fSm6wRjtxfCLme984Ger0359Q4PQa3s9aD5ewnK?= =?us-ascii?Q?c/ctovnOaA2yExYAX/vWn7PYfkZl1D5DrJiaI/SNdXqcMaE1bZim07Hma9H9?= =?us-ascii?Q?5GGiIYwranbxDWi2bMy6InW2UfNrbaz9oAQUunrcA254mIoNlN3Yx7bQNhL2?= =?us-ascii?Q?W8A3Tlw6ll3sFUGklLNqmc0OM4XhpQmbvi276fgL5J4UmY/65OMrKilRNq7Z?= =?us-ascii?Q?6Cq7zX6+uw21ehqnb/Vc/U1Xq3Pmq7pJmg0qeB6nPC7udlAMCLuCG5uHUIzQ?= =?us-ascii?Q?ybu3j/cnp6MLkw+tKBLlMu/8hCjwUyAGwtgmUob98hG2fLHHX7isg9r1SS5Y?= =?us-ascii?Q?wER3bbSmug0FP/v0nr/+Ml2GhLDw6qe1ckXAgKUq4QWmV414zIONLEmsCbOk?= =?us-ascii?Q?sQdCpATWCfWKBef2SWlLiOmaGses4GSiAieyXAvf4MZAfwTFVjtFJPFasJZQ?= =?us-ascii?Q?B4ppfkYXKrpKt/15Tj7JskzARJgrw2Zp7DLtA5a9A/70/ZfuMGjkgaNnZVnb?= =?us-ascii?Q?uggASKQpXf+/vGjMCJue+7QpJUsJomOzRYYZpj/cJppxp/QixD+4XQGdmMBN?= =?us-ascii?Q?PQbdQUAdyYFAizTEc4rpV7dwHQ47NX9Ka7a2rhEYscQh6EZDsul6kxMkdMFw?= =?us-ascii?Q?pWIYwAG8uZIFHhD0xdDzjlIB1uJkhtAL4J4iK/jL799CJkC4vcr99xkG0Xfm?= =?us-ascii?Q?yFNmzrEALLPKIQFmA95uTmn0yEAuSB8Jd9FHi8BWERFfBPWw94ylb1RloTTa?= =?us-ascii?Q?inu3RdehRSQOKVe4yk8S//fnJulR8f1fxc6+y+cFms7/PbHs30ueKbZ5tumE?= =?us-ascii?Q?zbTIAxCLFNbkXSKgElfzJlKNiay3vHEPhHUbhluc2khQEemjzOzzqKg+dFUI?= =?us-ascii?Q?ENJ9BEAgofiKq3Ptqlx7yfwYplDtWRYB3lSeOHDZ2mTT1/OVHNMmDqvOHZCE?= =?us-ascii?Q?Ustg47QTcmbjMrO1y7ZqjXAkJhhUPbbEUnMdn4Abn0xkvbitoGFUDS0N2jjN?= =?us-ascii?Q?FCsHZeB5B4uq/GQJpKOGJHZSGBxFQ7qq/H0bVcuEmw=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1a2177ea-c256-48b8-4171-08dc6f477576 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2024 10:13:08.8863 (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: AM8P250MB0216 Subject: [FFmpeg-devel] [PATCH] avformat/img2dec: Join branches 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Piped inputs don't support the ts_from_file option, which allows to avoid a branch. Should also help Coverity with issue #1500302. Signed-off-by: Andreas Rheinhardt --- libavformat/img2dec.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index a40675d434..5c2ff58f2e 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -502,7 +502,9 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt) } pkt->stream_index = 0; pkt->flags |= AV_PKT_FLAG_KEY; - if (s->ts_from_file) { + if (s->is_pipe) { + pkt->pos = avio_tell(f[0]); + } else if (s->ts_from_file) { struct stat img_stat; if (stat(filename, &img_stat)) { res = AVERROR(EIO); @@ -514,13 +516,10 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt) pkt->pts = 1000000000*pkt->pts + img_stat.st_mtim.tv_nsec; #endif av_add_index_entry(s1->streams[0], s->img_number, pkt->pts, 0, 0, AVINDEX_KEYFRAME); - } else if (!s->is_pipe) { + } else { pkt->pts = s->pts; } - if (s->is_pipe) - pkt->pos = avio_tell(f[0]); - /* * export_path_metadata must be explicitly enabled via * command line options for path metadata to be exported -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".