diff mbox

[FFmpeg-devel] lavf/mpeg: fix indent

Message ID TY2PR0101MB3181022F3E8ECB48E1FDB4F799630@TY2PR0101MB3181.apcprd01.prod.exchangelabs.com
State New
Headers show

Commit Message

Morris Stock Feb. 18, 2019, 1:56 a.m. UTC 
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 <xiaofeng.wang@bqvision.com>

>> Date: Fri, 15 Feb 2019 09:41:29 +0800

>> Subject: [PATCH] lavf/mpeg: fix indent

>>

>> Signed-off-by: wxf <xiaofeng.wang@bqvision.com>

>> ---

>>  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

>

Comments

Michael Niedermayer Feb. 18, 2019, 10:10 p.m. UTC | #1 
On Mon, Feb 18, 2019 at 01:56:22AM +0000, Morris Stock wrote:
> 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 <xiaofeng.wang@bqvision.com>
> >> Date: Fri, 15 Feb 2019 09:41:29 +0800
> >> Subject: [PATCH] lavf/mpeg: fix indent
> >>
> >> Signed-off-by: wxf <xiaofeng.wang@bqvision.com>
> >> ---
> >>  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
> > 
> 

>  mpeg.c |   56 ++++++++++++++++++++++++++++----------------------------
>  1 file changed, 28 insertions(+), 28 deletions(-)
> db4ff47863d9b8c5968cddf316882364c93bab8f  0001-lavf-mpeg-fix-indent.patch
> From 80ec71bf54f3b29169d5eb0a9375a11ceef8e692 Mon Sep 17 00:00:00 2001
> From: Xiaofeng Wang <xiaofeng.wang@bqvision.com>
> Date: Mon, 18 Feb 2019 09:16:58 +0800
> Subject: [PATCH] lavf/mpeg: fix indent
> 
> Signed-off-by: Xiaofeng Wang <xiaofeng.wang@bqvision.com>
> ---
>  libavformat/mpeg.c | 56 +++++++++++++++++++++++++++---------------------------
>  1 file changed, 28 insertions(+), 28 deletions(-)

will apply

thx

[...]
Lou Logan Feb. 19, 2019, 12:04 a.m. UTC | #2 
On Sun, Feb 17, 2019, at 4:56 PM, Morris Stock wrote:
>
> Ah, yes, but seems no one else use short name, see new attachment, thanks.

You can use whatever name or alias you want. We only want consistency, so future patches from the same address should ideally have the same author name.
diff mbox

Patch

From 80ec71bf54f3b29169d5eb0a9375a11ceef8e692 Mon Sep 17 00:00:00 2001
From: Xiaofeng Wang <xiaofeng.wang@bqvision.com>
Date: Mon, 18 Feb 2019 09:16:58 +0800
Subject: [PATCH] lavf/mpeg: fix indent

Signed-off-by: Xiaofeng Wang <xiaofeng.wang@bqvision.com>
---
 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