From patchwork Mon Feb 18 01:56:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morris Stock X-Patchwork-Id: 12098 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 27E5B4493CC for ; Mon, 18 Feb 2019 03:56:34 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0B23C68A7AC; Mon, 18 Feb 2019 03:56:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from APC01-PU1-obe.outbound.protection.outlook.com (mail-oln040092254044.outbound.protection.outlook.com [40.92.254.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DFAA268A360 for ; Mon, 18 Feb 2019 03:56:27 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=k9ZYZgywlwjgbfZlhpbQdH0AV8KR0dykso97ze8weiI=; b=AvHex4jTQAUZ4/MErgzvdxkhYkopSKNd2T/68u4REztIyp+iAUbmIRkLKE6llDnJnSUz2mt4TKih6UyD3Zugu6jaxmkYMdjdpR5tjGeLPYuBIm5U9yHyiJ5k3hMPu1XQcAoXuosaE2x/re1zA/mTsveuWycLJZlC/cCUzgbBZaBDsfaOtyZ3lyRVYqxmoMI/64QI6DC7vvX3E9ZpFNEaxTKBN76TyaBIAs2eobKwF5pYOlIYOVpxr1GY3Bm/5KMy2mqM0+7Xrs+6760gVLY21uOA1cCw9JFveg05Zge+BjF1ah0ltgcDDE1Yq3vhPTtMQHBP+7GY6FJ/wJFWrLH3tw== Received: from PU1APC01FT063.eop-APC01.prod.protection.outlook.com (10.152.252.54) by PU1APC01HT220.eop-APC01.prod.protection.outlook.com (10.152.252.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1580.10; Mon, 18 Feb 2019 01:56:23 +0000 Received: from TY2PR0101MB3181.apcprd01.prod.exchangelabs.com (10.152.252.54) by PU1APC01FT063.mail.protection.outlook.com (10.152.253.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1580.10 via Frontend Transport; Mon, 18 Feb 2019 01:56:23 +0000 Received: from TY2PR0101MB3181.apcprd01.prod.exchangelabs.com ([fe80::c0dc:d1ce:b3da:dfdd]) by TY2PR0101MB3181.apcprd01.prod.exchangelabs.com ([fe80::c0dc:d1ce:b3da:dfdd%3]) with mapi id 15.20.1622.018; Mon, 18 Feb 2019 01:56:22 +0000 From: Morris Stock To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [Patch] lavf/mpeg: fix indent Thread-Index: AQHUxiJwVuvapLCc5U6K+4rK9geNtqXkzf6A Date: Mon, 18 Feb 2019 01:56:22 +0000 Message-ID: References: <20190216180656.GV3501@michaelspb> In-Reply-To: <20190216180656.GV3501@michaelspb> Accept-Language: en-US, zh-CN Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-clientproxiedby: HK2PR02CA0216.apcprd02.prod.outlook.com (2603:1096:201:20::28) To TY2PR0101MB3181.apcprd01.prod.exchangelabs.com (2603:1096:404:e7::15) x-incomingtopheadermarker: OriginalChecksum:73EDF646CF4A2370CAD889B65A5EE3770A1A3EB3B86064326DBA8A750B825717; UpperCasedChecksum:3BF91B499F684A1EBBB2E775D9023291036167B5490151BE610B1F3BF212B632; SizeAsReceived:8445; Count:62 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [w75fKoEK7cnnVeheChAL5/TCUo1NRIpH] x-microsoft-original-message-id: x-ms-publictraffictype: Email x-incomingheadercount: 62 x-eopattributedmessage: 0 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031322404)(2017031323274)(2017031324274)(1601125500)(1603101475)(1701031045); SRVR:PU1APC01HT220; x-ms-traffictypediagnostic: PU1APC01HT220: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(4566010)(82015058); SRVR:PU1APC01HT220; BCL:0; PCL:0; RULEID:; SRVR:PU1APC01HT220; x-microsoft-antispam-message-info: bKlryFNNewJGQoKRX89EGP+txMdDZPncQfY3KLfPTKhSDCx8GOVT0GKlfMg1RcQ+ MIME-Version: 1.0 X-OriginatorOrg: hotmail.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 7181d4b0-87d6-4f4e-ba33-0d3746212cec X-MS-Exchange-CrossTenant-Network-Message-Id: d2fc90ef-6d0b-4d65-a0c4-08d69544485c X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 7181d4b0-87d6-4f4e-ba33-0d3746212cec X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Feb 2019 01:56:21.5552 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1APC01HT220 Subject: Re: [FFmpeg-devel] [Patch] lavf/mpeg: fix indent X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" On 2/17/19 2:06 AM, Michael Niedermayer wrote: > On Fri, Feb 15, 2019 at 01:48:04AM +0000, Morris Stock wrote: >> mpeg.c | 56 ++++++++++++++++++++++++++++---------------------------- >> 1 file changed, 28 insertions(+), 28 deletions(-) >> 2c6d9fc35eaf3f348761d553ec3029275709acba 0001-lavf-mpeg-fix-indent.patch >> From 2a2dc1dd417a78650675f327f6db832e58e229a8 Mon Sep 17 00:00:00 2001 >> From: wxf >> Date: Fri, 15 Feb 2019 09:41:29 +0800 >> Subject: [PATCH] lavf/mpeg: fix indent >> >> Signed-off-by: wxf >> --- >> libavformat/mpeg.c | 56 +++++++++++++++++++++++++++--------------------------- >> 1 file changed, 28 insertions(+), 28 deletions(-) > > LGTM, if the 3 letter author name is Intended instead of a full name > Ah, yes, but seems no one else use short name, see new attachment, thanks. > [...] > > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > From 80ec71bf54f3b29169d5eb0a9375a11ceef8e692 Mon Sep 17 00:00:00 2001 From: Xiaofeng Wang Date: Mon, 18 Feb 2019 09:16:58 +0800 Subject: [PATCH] lavf/mpeg: fix indent Signed-off-by: Xiaofeng Wang --- libavformat/mpeg.c | 56 +++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index d4369b49c2..c147fa72ed 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -525,34 +525,34 @@ redo: } es_type = m->psm_es_type[startcode & 0xff]; - if (es_type == STREAM_TYPE_VIDEO_MPEG1) { - codec_id = AV_CODEC_ID_MPEG2VIDEO; - type = AVMEDIA_TYPE_VIDEO; - } else if (es_type == STREAM_TYPE_VIDEO_MPEG2) { - codec_id = AV_CODEC_ID_MPEG2VIDEO; - type = AVMEDIA_TYPE_VIDEO; - } else if (es_type == STREAM_TYPE_AUDIO_MPEG1 || - es_type == STREAM_TYPE_AUDIO_MPEG2) { - codec_id = AV_CODEC_ID_MP3; - type = AVMEDIA_TYPE_AUDIO; - } else if (es_type == STREAM_TYPE_AUDIO_AAC) { - codec_id = AV_CODEC_ID_AAC; - type = AVMEDIA_TYPE_AUDIO; - } else if (es_type == STREAM_TYPE_VIDEO_MPEG4) { - codec_id = AV_CODEC_ID_MPEG4; - type = AVMEDIA_TYPE_VIDEO; - } else if (es_type == STREAM_TYPE_VIDEO_H264) { - codec_id = AV_CODEC_ID_H264; - type = AVMEDIA_TYPE_VIDEO; - } else if (es_type == STREAM_TYPE_VIDEO_HEVC) { - codec_id = AV_CODEC_ID_HEVC; - type = AVMEDIA_TYPE_VIDEO; - } else if (es_type == STREAM_TYPE_AUDIO_AC3) { - codec_id = AV_CODEC_ID_AC3; - type = AVMEDIA_TYPE_AUDIO; - } else if (m->imkh_cctv && es_type == 0x91) { - codec_id = AV_CODEC_ID_PCM_MULAW; - type = AVMEDIA_TYPE_AUDIO; + if (es_type == STREAM_TYPE_VIDEO_MPEG1) { + codec_id = AV_CODEC_ID_MPEG2VIDEO; + type = AVMEDIA_TYPE_VIDEO; + } else if (es_type == STREAM_TYPE_VIDEO_MPEG2) { + codec_id = AV_CODEC_ID_MPEG2VIDEO; + type = AVMEDIA_TYPE_VIDEO; + } else if (es_type == STREAM_TYPE_AUDIO_MPEG1 || + es_type == STREAM_TYPE_AUDIO_MPEG2) { + codec_id = AV_CODEC_ID_MP3; + type = AVMEDIA_TYPE_AUDIO; + } else if (es_type == STREAM_TYPE_AUDIO_AAC) { + codec_id = AV_CODEC_ID_AAC; + type = AVMEDIA_TYPE_AUDIO; + } else if (es_type == STREAM_TYPE_VIDEO_MPEG4) { + codec_id = AV_CODEC_ID_MPEG4; + type = AVMEDIA_TYPE_VIDEO; + } else if (es_type == STREAM_TYPE_VIDEO_H264) { + codec_id = AV_CODEC_ID_H264; + type = AVMEDIA_TYPE_VIDEO; + } else if (es_type == STREAM_TYPE_VIDEO_HEVC) { + codec_id = AV_CODEC_ID_HEVC; + type = AVMEDIA_TYPE_VIDEO; + } else if (es_type == STREAM_TYPE_AUDIO_AC3) { + codec_id = AV_CODEC_ID_AC3; + type = AVMEDIA_TYPE_AUDIO; + } else if (m->imkh_cctv && es_type == 0x91) { + codec_id = AV_CODEC_ID_PCM_MULAW; + type = AVMEDIA_TYPE_AUDIO; } else if (startcode >= 0x1e0 && startcode <= 0x1ef) { static const unsigned char avs_seqh[4] = { 0, 0, 1, 0xb0 }; unsigned char buf[8]; -- 2.16.5