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 0774649BBE for ; Mon, 4 Mar 2024 13:34:21 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 691AA68D45F; Mon, 4 Mar 2024 15:34:19 +0200 (EET) Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2088.outbound.protection.outlook.com [40.92.50.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B316F68D3B0 for ; Mon, 4 Mar 2024 15:34:12 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eNuwOCgfeeSSOk6n1vn4V5XnOSPG3wEBjBg4I6Z43wz2kkSJ720VVi8IQXaw3y5JZX/Qk/1sHGW4sXP7EcQc/EorpVfZtXzXmPNilkiWUGVgFNTI5caceKTsQ2FxSvwSUIuEnjAwBpS2fkVyOkgArSJjhECPHnA43Tj59mgFiW0b79s6f6wFX2+g5G3dClzkEgAVNiV2FVOyB9TU06to/4vgGYESAisVt/xB9MA9rubzIBjdkg1HkHZJWLm8KtWdoAr03Sg939tO/qfHOEJeDCD3xc4RbSgV/wk14kD+b24G+0Vxx1MT3RjafJgWScir3mfwbmEKSuACfjrzhDskHw== 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=//qnTpJBLUWLA1Pe715phK0BXCPOGhVULDeC/M3drPg=; b=VsRElv2JLpNQmKu84BslesMZfWxJAWYqFLcBU3c7GXuQ+lNB5+DbOG8igi1rs3VNo/I1YkXdd5Qy9kzqHMQFO/kyZYmfh57B8/WRFdQ/lofa3O1Q1zN26ABzSrcHEFtfmgFr+WkzgJo0GcTA0IlXyjMClP6qNYeJaWky5QAlP/nKDPSFHl50+XOs4qDZ9zUrrAIepvfvAPTitbKWDULokhefBauLPTjt8qS/s35TaAktrCK3MaV+h5qphCnus2VM3U5Um8o1s7BMuLJHBF+GJZyl3xTLwLe45fo8LGKZUyoCpqat/LRZOx5lBaXFuYwAAmVdruB3ZXbciweVG/X5uw== 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=//qnTpJBLUWLA1Pe715phK0BXCPOGhVULDeC/M3drPg=; b=tT1jTXVBJnqJgZRPsLCLVQ2hACHLR5VzoIuy+uLcUa4QBnDIMjNUB/+Emzku8TNEJz036MfG2mE4cpD0jTNje7q0UO3OghaPEYWgc47Cgjpkod2eSPcLgERr6XAyu2AR+p9ox5RSOzz0SZcHVEdfNx9+hZcwppaMg5GoLapZ46VOsj6F0aFDftWM9UzYkyRCGCU2uTfngPSgMgPkFJp3a2Ar9WLjkJpeTH7fPBPXsri9DyZdE01T+eNkYjf40fUgPDrsz656KteWMY9sEZhGBR5xwtjMf9LMAC+5K5uilRtGjdVdzsW69KtPxDYY0Jwp1rFEckVdw6TA2F/YmeJdCQ== Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) by DU2P250MB0271.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:270::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38; Mon, 4 Mar 2024 13:34:11 +0000 Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc]) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc%3]) with mapi id 15.20.7292.036; Mon, 4 Mar 2024 13:34:11 +0000 Message-ID: Date: Mon, 4 Mar 2024 14:36:09 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20240304130657.30631-1-anton@khirnov.net> <20240304130657.30631-23-anton@khirnov.net> From: Andreas Rheinhardt In-Reply-To: <20240304130657.30631-23-anton@khirnov.net> X-TMN: [49mdb2AgpsPFCWZjXqp1TfGmWFXmpeLpRFG4bZa0z1M=] X-ClientProxiedBy: FR4P281CA0130.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b9::18) To DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) X-Microsoft-Original-Message-ID: <9da436c9-5e57-49f8-aeb6-98669d9e50bd@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_|DU2P250MB0271:EE_ X-MS-Office365-Filtering-Correlation-Id: ef10f3e7-885c-4c17-60f5-08dc3c4fc66c X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnobO8iTf6ZFRqDwZq/57cxG27qDlBkL5TxtnjZi/SKM+CTlloyrKJse/qkPlkKNCtdAmPNAp9PwcSeK6BSScXf4HI2F3hze73MBWEPwQL4dRgwm2K6IYmzVwTKTZqBj9aDXjL1ny+7Y6pIPzf5eLuQYpQ+spIHPz2SZZZZkFfy4bIk1+3YZxrNF68qs2CDwOFkZLyEAIDZSY30NQf9SgIJPqtUChQBwyf4C9AGRmU3DRgoqStH+bl0U9iUxfcZwVv6/ccE7Djvc98MZ3SM06b4aFu+tX0C+B7mxO/o8Lrpn9A+2hKCl9YSu8zN7hMbnIIniM5R4vmkntlZ6WCrDg3SvdPOhLfli+0yXilxN+9l9WK2e/KWJeAHLNj2mfEY3IrWW5vybyJHJoq46MsVuZnDO3BgSS+PYVs59mpN1GmLzYSlYfJ6nTgz/Iy71ADRSL7Q1QdMFGVoJGQLY0NF9gRUOKwHh/NNtY5FqnUbyejV9r5wHPvMzNvCyQ0Ls8ESv2Y7bJPCAYE9nQjLTYvBzNWLR3f/FtZ7f1Dd/oIWfPz7Ld3Ah5Z7u37j94pNU7c2tiU9XIpM3Yvp3Uv2qa+gsx3gUKZGT2pxBFl+6P6pfkqu1KtP65boSsb60GX7YipFHvJpukv6uvcYd+KGq0RBgY61kSbVuFCrhw6MlNWWZjlDz/mg4QRP+5l1xu1/ZXZCTqzQksK0pkYA91+QUVvpZoQE6srrmk4q+ODWD6PIAnsrH0Q15FINpmYWEu3ljGhBK6eU= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IX4RSlI87fEAzUPn7mC9Qhy3uokon+67NbC0r6p/ZRX19hNSq9WE1dMen4O+cioPMsBZXe1a/Kqo1MdyBX6rY4Z+eYiOL2bQSutANEPhpuU3p8tIBOEQuRd7h0xHYvDUayCt7V+33zGD7i6TC8nwaZ6TiPvBjQ/lCY+KNqQ6CyPjr8/5ZTdEOd+9BDqlnu3sRjqQ8+sw3cMEPg5JGWRPwXihNWThOrGfIgiTUgL1UqAYJT3PplN3zk1vBtMk5EevhYxxFgY0HZNh6SUUF75lATrowjsMhWA391L57PnhNuBk4xl6bwkG1LgUvxRJGoriQ5cXOXMwlX0pYgz5/HJ5JnJf64y8fcqKbzngZmcyyW67r9FhQ/oBZIQrGc/xHMlyUwrPXtfyxlDatgiD/D+ipzasTAazvZVOYHQi5NHapP6Cb3tbpTK1y+ptMQOReC08p7Ja249H7giGD+S4YZW3vQLTheM5kkmP8jNweTpC7nKzEaZktQWqH/IGt90+NoVoKBq1RQ6S1ei8eA/xGNgiIMgnscn/un8RJ6ufOvsLUuCgBKUCSHnIhK9dPq4NG4YM X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?T1NmZll0ZE1nNk5pOEUyQ2t4blFlN3NER0FlRjJHbFFLeW01WDNCemdTaEE0?= =?utf-8?B?TFRxYzVqcS91Z2NFa3BsMzYydmllY2k3NVRIODlnTkNocmJqVzVYNXJDYW5i?= =?utf-8?B?NXExRGRXS0JDOW1DbjBncG1acGlra0ovbStBNlRZbDZINE81ajk0d1E0RDc4?= =?utf-8?B?N2RCQ3l2djhzNlJ0Z25nSDZ6MFdUbVJWdGdlRVdqRDBZY2FOenNlcDhVVXhz?= =?utf-8?B?ODIyMmJUVTkvMk9Nb1dPWURrT0xHVExGOENCVDhEVXdDb01yelk5WlpWWGdu?= =?utf-8?B?S2FveEhFWHRBWVR2UVJMSTVtMWZ3OFRPZDg1YXBFRXZRQXNjR052MHJpV1ZP?= =?utf-8?B?MmQ1WmdHNFlMU2lYUEhXeFhSaVdUUDFJUUh0aFpwV0xEdnJlKzFUZ0NDTHlQ?= =?utf-8?B?bituT0dhK0FBdGYrV0hZUUxiU1dvU0VYQUdtbUdHaFFOdzNGdXVXZndrNk4z?= =?utf-8?B?WlV1dnJXeTA3RGRlb0xHTGx2TlN5OHpFZE9hc2cxVVQ3U2o0c2E0UGVTUU44?= =?utf-8?B?YjVkcXV3Y0l2bDR6andIRG5NZ25oL0pRUXJhYnBrNmxOV2c2MjExNkVTb2d2?= =?utf-8?B?NTllaE5MYmIreFJTNXRIWVh3ZVlraThaUVkzUlVGTWxpTFBmTldvK0QxbGNw?= =?utf-8?B?OVNqUDd3dS9ZMWYzNHVRV1NlNzZ3MHR1cnJYRVdjMXZVMHhXMXBKTkVsWko0?= =?utf-8?B?QnVvUytVZ2trTTZtcXNKLzJNdEVNanhIY1BweW9vSVZuUDFKNDgyWWM1TmVi?= =?utf-8?B?OG1lQjh5ajlhZER5dFBmRURMOWkwRWZuZTl3TUNuY2RtV1JMTjVRSDNVOFBB?= =?utf-8?B?aWR5OEVRdVcwS3Izb1Z3UHhxR1FZSWE1eHhHUXdKUm1oWE1FdmJaeWtnVzBo?= =?utf-8?B?bU8rVjc5MHoxVTU0VklVRDh5YXdWUVpseEo3VS94NklvczIyY2tERy9MWDU2?= =?utf-8?B?QnBxNWVSTDYwVURXaCt1K0FWdmRHRmlYWC9iRktiQW53b294bWN5UlhHdE44?= =?utf-8?B?b0dodlk5d0RzSStlVlkrWUgvdWMzclNqcGZlanBWelcvamx2UEFpTnNTL1VN?= =?utf-8?B?RE90WThUSHppWnRsTi9rd1ovSWJmYXZJQmg5QnhDKzdoNzhPRG9pdzRNdG1q?= =?utf-8?B?Z0hCbFJwWEdoTXhWd2tabU0vVHZsclN1Z1FkOG42am5jbHdNZlptemU5TWxD?= =?utf-8?B?SkQyRnNSOFBEZFlQbWtmTElhdGVIalN1c2d5T0ZLMmRDRHA4Rm5pNXRQUWla?= =?utf-8?B?TUpyOVVPRTFMK003WnhWYlcyZFM4aEZrMldsTHJoRHYwazA1amc3Q1N0ejRn?= =?utf-8?B?YnRDSklab2h3UHJERHBYMzV4LzlDbjB0SGxOYXF5SFV4VlhDMHUydGdjbjBm?= =?utf-8?B?WnBoeUpkVVNtSkJTbjVpZkYvT2RHZ2NveTVLNThvREEvL21STGxHb0dqNEl3?= =?utf-8?B?aUtxcTd1OWEyeUs2TEZERGg4TFN2dWk3VUNtTWVndDdoYWhEZGkrVytGL2U4?= =?utf-8?B?djlCMCtROUtMNjl1Tmp4MkgzNU5xdTRzUUtTcE90bWlKR3Z2OGtSODRBbDQv?= =?utf-8?B?cEg1eXhhTENwdGxmeWI5d1pOczR1Nk9tOW40citkT3p1WloyNENFelFhVHdu?= =?utf-8?B?Nk43ZC9GTVI2aDZ5RzU0dU1KY1A5ZHA2YmZaeEM0TTdieURWcFZMRkxseDU0?= =?utf-8?B?c1FoM2ZPSFFIWE1LczBWSncrSG55c3lUb05mSWx4MDJqc1ZMMDNSZ0dnPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ef10f3e7-885c-4c17-60f5-08dc3c4fc66c X-MS-Exchange-CrossTenant-AuthSource: DU0P250MB0747.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2024 13:34:11.0689 (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: DU2P250MB0271 Subject: Re: [FFmpeg-devel] [PATCH 23/29] avcodec/mpeg12dec: use ff_frame_new_side_data 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 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: Anton Khirnov: > From: Niklas Haas > > For consistency, even though this cannot be overriden at the packet > level. > --- > libavcodec/mpeg12dec.c | 18 ++++++++++-------- > 1 file changed, 10 insertions(+), 8 deletions(-) > > diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c > index 3a2f17e508..aa116336dd 100644 > --- a/libavcodec/mpeg12dec.c > +++ b/libavcodec/mpeg12dec.c > @@ -2531,15 +2531,17 @@ static int mpeg_decode_frame(AVCodecContext *avctx, AVFrame *picture, > > if (s->timecode_frame_start != -1 && *got_output) { > char tcbuf[AV_TIMECODE_STR_SIZE]; > - AVFrameSideData *tcside = av_frame_new_side_data(picture, > - AV_FRAME_DATA_GOP_TIMECODE, > - sizeof(int64_t)); > - if (!tcside) > - return AVERROR(ENOMEM); > - memcpy(tcside->data, &s->timecode_frame_start, sizeof(int64_t)); > + AVFrameSideData *tcside; > + ret = ff_frame_new_side_data(avctx, picture, AV_FRAME_DATA_GOP_TIMECODE, > + sizeof(int64_t), &tcside); > + if (ret < 0) > + return ret; > + if (tcside) { > + memcpy(tcside->data, &s->timecode_frame_start, sizeof(int64_t)); > > - av_timecode_make_mpeg_tc_string(tcbuf, s->timecode_frame_start); > - av_dict_set(&picture->metadata, "timecode", tcbuf, 0); > + av_timecode_make_mpeg_tc_string(tcbuf, s->timecode_frame_start); > + av_dict_set(&picture->metadata, "timecode", tcbuf, 0); > + } > > s->timecode_frame_start = -1; > } -1 to everything that is only done for consistency. - Andreas _______________________________________________ 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".