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 9E8FC48FD9 for ; Sat, 2 Mar 2024 15:40:32 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DB0F068CE06; Sat, 2 Mar 2024 17:40:28 +0200 (EET) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2082.outbound.protection.outlook.com [40.92.91.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4AD8168C830 for ; Sat, 2 Mar 2024 17:40:22 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bmUGcqVmwHENFWevFnXEPtciOLITfX8zx5DWboNKKH3ZduqtgHoGZSI8t8u5u78h2ssQ3vA1q1yO3GX5TppPSN4rT26WSqiyn1nTDncYrQxswyESv8D02EElnWdVBxCs5sAWyDyvhNDfffziM04EWrEpnkNVLcFrN0dDPLWDTYsHB5w+XtfetEXRAZDPlj8iURnmFxW50zXvfkzIF9SJyMsYoTYjEXZMmPGwP2IZsSWSkZDFIx0qDiGB+Us0seGysq950axjF9yCFFD6hEexreUVrZ3emFJMm1fbsJc6Mu/A98jUEQ2FgKbWlrZ/vl3jvmnFXdI35g1Cm1uA8MmEBQ== 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=+GvvhXzkxEU4gkO0TduC+QVc2dBfJYV4RDiH35kgwgA=; b=E7SCvSZZx7BP4eBVmuWaHfnZe8egXwz9qljkxFVY656JPu/qV+lQQJlcZJooXTeuYLvN6WMYjY30C2LuIXuad2iiZXMsSFEMWMF2vLoqhDKQ5EUdhNXFZ8MO902cH102ARpLQpI+Qbgzk/Lt8SgIkYA8jXa3E/yEOr8Faw9u2gIZXBH9xKfF7c5rGAWEEv33nHdR+yGqivArndUZwuWknhz63CWTr0m8nV1EVTaImFr5DZPLKZXJMMsJZ2u8mSZuvaFRq3HKXBLXXVYXK8oC/PccAOQ3w9lQ5YvXkjLWOX56X8adANx11splf8LHxTTCRH74G4RS9W5eVz5qhBWDAg== 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=+GvvhXzkxEU4gkO0TduC+QVc2dBfJYV4RDiH35kgwgA=; b=AVTJRB04sQ/Gr1JXrW2okXRw6LIEdQn/LP0pgGnADzm2mfbuCeb3l5Njy4xipGqC8Dilg7B5gXyL1gHYHTU/hJ/RUdbT8BmP6ZaU3Bbtg7ceULri+aPAIGEb4dy+sisnxn6u/XesXOk/CIMvn7CmTxDQGguP+zX6lwWZHJviExwCAnNxz4eqMZ9v+8kQCt9O4Np/LrVaj3zcJTivortHcA4XpGfqDgcPZfT/ZZiU/7nojVsWuBAqBUz9MDGpKK/IFJxoT/TxnE4TmVHldJugemVwkmJQpb+MZnuU+kG5FYqdln94IQr1NI//rSfCgec3RV14M7HAh7u9IeyWmDdpUg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0293.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:328::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.34; Sat, 2 Mar 2024 15:40:20 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Sat, 2 Mar 2024 15:40:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Mar 2024 16:42:10 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [si0LXKAKlKjXciQ2e0VkRcH4ctpPjD+AS9CWn+2pB6Q=] X-ClientProxiedBy: ZR2P278CA0060.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:53::20) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240302154213.4047858-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0293:EE_ X-MS-Office365-Filtering-Correlation-Id: 9e15325c-4722-489c-3c59-08dc3acf1151 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnp1Zl+T4aq3XJ6trwEamTGXSSNzKd4bEtNy5baatf7GKdgkeZNX/AGzkqG62se7hZiLsKjm45ox4C1Q3/MLS2TqU9UraQ79RnZo4TxsP4DggWIznqhr2RkKeVEfhLmL917LOOfE2s2dpOCHmnv8d+48VQEcdxDdRDmj4MqwGFXYwp6wOGkFy9VrJFwET1wAaMO1KPTaCq6540rqBoqSOeQ54JPeLjM3Q00O0/yc93+U8pDKy62dabeK0lYec3jjccrTcM9zH+K6vcpiA1LneFporPEehERS4AkPpRFxEH6HQh1FBhcv1KwYyQR4un7Ih8ywaBZrWikb/7wLCTZwB+M7+brQw19tzD87VOKpsedj5pcxfz+cBDr4rNZ3ZocoL1B58vyUsXbLb7j5f0ru0L6RVoxNIE+6/Ywntj9EC6QhMubvYO5ESRO9zTxZSSVXRU/n3v864KWGKoOhqJ9HX0hdv0JYbyGNAH3/oa9s3/K9tKUr5G9oJuVYxYUjuSrgf06J9wFJjHrq4T5HjlElyrF3VpQ4LFiQViyCH3FpLrVaHp8eiasIge2kkbJdMvMp4S1qvhcD8jjP1uyKK/RT4VGoARr0BhX13/DaKJlgzRBnBdqCylUEdpLVXFH0YI6eCX3oN8G9Ye6VCu6HSJNq+O/aOyg8x9nEV8BxEqmcjh4SfgdWXSwiSARpdiuSLjxNAeV7+WwIe3w8by0PzpfTegazesjBY6KCBUOTvipHzjYuWa+3hjkG1mVYkgiUXb1bn2Y= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: II60m8jqXjjQvusTGUSEC46olU9/Rz1vf5QUBqqSSgwnKNcsb2d8v0B7B2Xn6SjQtMDtetRt6CzPZNRq6N/Q66dqlpRyb7Y62Q9nyKbZtGS7fGh5XEOEFiNZwcpQCWylapuwIa6GLWZTPgItLqC/sIGVV5CFjK8ukx1/CjzOpPv+Eq4pMw+W8xJXoVQ4USkRULhQmkY21z5M9n7I7fQupLgU9aEEKn1xMbDJdgSHw9xW+ieaVvBgr12xwyHBhVJQzQg4ZKTmmcAUuhzaxzgdcJZODs0yIir7idbmNm2BqSP6aStKdBbWxr+yxLliSgOINmbGq/+1bjUHkKPldnb5o9UgFFnSwdx//LlGIwcEZPLfxwHANBx4d93ZDkeRimdkpWk3dq/z8kGfybXN3XINquD7MeCvmeYL8CvujCN4ClZ04QiP1mssmJujapbb236GRrBqLqDoBbJ/745RaL8/CzvU8KwVSzASEw/AwbupthXh9u3NuBU9a3qzwQorFH3CS+PzDpYt4uAAPhHWrdQ1tpBBAXVNqUlRIhUJ+cGy6uCGQ3ODwp8puefXe+5x7xuq5QrIxc1nvX4K8MSZO/blZEjbI82symfHdM0NejjiAA0p33bTsvUnHQgJuBRvIBzb X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?JQpWeoReGhdzdcqg65WZtBzF7KCIeQmPccGk/Zu8tYv0LBXAqDsbt5OPqYZ6?= =?us-ascii?Q?fGOXdQNL9gWWhc96M7GoY41l8+3nTKC+tgDrHlbmmY03LPpAHM8LzztcQyhv?= =?us-ascii?Q?bhkP6pahxW7dZbj6+fm89XHngmw2kYldxCXUYh9CTWNCtQ8nPiYN/+CcWTtI?= =?us-ascii?Q?rkD5lv/3onz7gVXOTtCuu9PVstbfI5HUB/n2NKWrQb1oevmppQV9xqQspkZJ?= =?us-ascii?Q?ORU/K82iivoLHd6LmGA610NcVNPHgaqrZ5tmCHncYVriIFgyif7Rvxzbms39?= =?us-ascii?Q?QOGk/MXNjZXrezaKZeBIFTWVznf7+tEw6i8kzaqndnB7mV2blq/qDK/mtDV4?= =?us-ascii?Q?BJEOX870HcK6Ibrj3Dq5otmOuVeADRD6I8HQGJ69sScS+cus8kkSE9cF1Jse?= =?us-ascii?Q?V2ucvfLkmlHKdM7v++s7l4f4/f8afxkJxEUVSF0Bm8UC5wavMQMUCmIoUZGX?= =?us-ascii?Q?IHXNzCY7vqE6IRKyllIDLgJEBOlNymMeFRMQd/B9ip7j+aWEQDQftpw1lphg?= =?us-ascii?Q?0LUHKduoTM2VfL7pk8wbN6NcwAHPqVUUo+F6Aq7MIGRlOE4XmHikX+4BsaL3?= =?us-ascii?Q?275fc+okhO5/7KUDcS0PJXDNxGmAPgKXgDFOX9S2ytu1ghWkPVTxzYcx9ds+?= =?us-ascii?Q?oD43xd0BWMPD/vL0RCI0kW8iH4L5hZKXa279E6az4DK1ZIfTir6N084y6EQB?= =?us-ascii?Q?d8HmXbVxj9mO24+M/J8Kaa4l4cpMELAD8vVAUj1oCgFC2sPbyHkecW9VWcOl?= =?us-ascii?Q?ZZCmOXx2PlNnOW0csOtDxHrTnXFegCdRHagZKQ8XX4qnLhDOcv1BZn/lo2u/?= =?us-ascii?Q?mCL4Ok+hosnvirH+dfyXab3M7FUURjM4fe8g4B1fdVnu7ioCBDqtiXKA9ouS?= =?us-ascii?Q?pFnFddLNbtiF5N29ba/shatTUSDdm4gVa7fKcJK70ZgnFf08wpbsw8Lapy8b?= =?us-ascii?Q?mj/xxix+A3tdpC3eecl07lE92lffewbKYYdvalTP5mCpOdytAJ9BQum718zq?= =?us-ascii?Q?9gwWE5Es+U6YAAo6HfTXJZrlr5vaMlEanJsuFp/MztyoMZx8cmf6zFg90eWC?= =?us-ascii?Q?Td6vlSDJN0dU+9yzUPQdjfLhtV0VpSSc5gOD0FrqCGJdXGAylZWB4SYcs3l9?= =?us-ascii?Q?WHSp/D52pSfl5VyzbuT7LYShiYbnPf1JU9iPBgP5y7k7lC/eHgyH/woAbAr4?= =?us-ascii?Q?qz43VJ4F84AsVG6tL01e5oCRUMml3meNHjT69du1hYq/iYHbe3KESuxqGOg0?= =?us-ascii?Q?b05hwOn+3dBWwQRls4C2Cfv69+p2jREuA7RsPvr2ww=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e15325c-4722-489c-3c59-08dc3acf1151 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2024 15:40:20.4822 (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: AM8P250MB0293 Subject: [FFmpeg-devel] [PATCH 1/4] avformat/dvdvideodec: Explicitly return 0 on success 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: Don't "return ret" even when ret is zero on success. Signed-off-by: Andreas Rheinhardt --- libavformat/dvdvideodec.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/libavformat/dvdvideodec.c b/libavformat/dvdvideodec.c index 3355010356..fd1f640560 100644 --- a/libavformat/dvdvideodec.c +++ b/libavformat/dvdvideodec.c @@ -863,7 +863,7 @@ static int dvdvideo_video_stream_setup(AVFormatContext *s) return ret; } - return ret; + return 0; } static int dvdvideo_audio_stream_analyze(AVFormatContext *s, audio_attr_t audio_attr, @@ -1032,7 +1032,7 @@ break_error: return ret; } - return ret; + return 0; } static int dvdvideo_subp_stream_analyze(AVFormatContext *s, uint32_t offset, subp_attr_t subp_attr, @@ -1056,7 +1056,6 @@ static int dvdvideo_subp_stream_add(AVFormatContext *s, DVDVideoPGCSubtitleStrea { AVStream *st; FFStream *sti; - int ret = 0; st = avformat_new_stream(s, NULL); if (!st) @@ -1080,7 +1079,7 @@ static int dvdvideo_subp_stream_add(AVFormatContext *s, DVDVideoPGCSubtitleStrea avpriv_set_pts_info(st, DVDVIDEO_PTS_WRAP_BITS, DVDVIDEO_TIME_BASE_Q.num, DVDVIDEO_TIME_BASE_Q.den); - return ret; + return 0; } static int dvdvideo_subp_stream_add_internal(AVFormatContext *s, uint32_t offset, @@ -1098,17 +1097,15 @@ static int dvdvideo_subp_stream_add_internal(AVFormatContext *s, uint32_t offset /* IFO structures can declare duplicate entries for the same startcode */ for (int i = 0; i < s->nb_streams; i++) if (s->streams[i]->id == entry.startcode) - goto end; + return 0; if ((ret = dvdvideo_subp_stream_add(s, &entry, AVSTREAM_PARSE_HEADERS)) < 0) goto end_error; - goto end; + return 0; end_error: av_log(s, AV_LOG_ERROR, "Unable to add subtitle stream\n"); - -end: return ret; } @@ -1291,7 +1288,7 @@ static int dvdvideo_read_header(AVFormatContext *s) if (!c->opt_preindex) return dvdvideo_chapters_setup_simple(s); - return ret; + return 0; } static int dvdvideo_read_packet(AVFormatContext *s, AVPacket *pkt) -- 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".