[FFmpeg-devel,1/6] avcodec/iff: Add "else" to make code look prettier

Submitted by Michael Niedermayer on July 13, 2019, 8:25 p.m.

Details

Message ID 20190713202506.14871-1-michael@niedermayer.cc
State Accepted
Commit 84669b1872269a458266b63005cade9788a00a64
Headers show

Commit Message

Michael Niedermayer July 13, 2019, 8:25 p.m.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/iff.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Peter Ross July 14, 2019, 5:55 a.m.
On Sat, Jul 13, 2019 at 10:25:01PM +0200, Michael Niedermayer wrote:
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/iff.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/iff.c b/libavcodec/iff.c
> index c6e2359b00..7f1c589d7c 100644
> --- a/libavcodec/iff.c
> +++ b/libavcodec/iff.c
> @@ -284,7 +284,7 @@ static int extract_header(AVCodecContext *const avctx,
>              if (s->bpp > 8) {
>                  av_log(avctx, AV_LOG_ERROR, "Invalid number of hold bits for HAM: %u\n", s->ham);
>                  return AVERROR_INVALIDDATA;
> -            } if (s->ham != (s->bpp > 6 ? 6 : 4)) {
> +            } else if (s->ham != (s->bpp > 6 ? 6 : 4)) {
>                  av_log(avctx, AV_LOG_ERROR, "Invalid number of hold bits for HAM: %u, BPP: %u\n", s->ham, s->bpp);
>                  return AVERROR_INVALIDDATA;
>              }
> -- 
> 2.22.0

well spotted. please push.

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
Michael Niedermayer July 14, 2019, 11:41 a.m.
On Sun, Jul 14, 2019 at 03:55:54PM +1000, Peter Ross wrote:
> On Sat, Jul 13, 2019 at 10:25:01PM +0200, Michael Niedermayer wrote:
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavcodec/iff.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/libavcodec/iff.c b/libavcodec/iff.c
> > index c6e2359b00..7f1c589d7c 100644
> > --- a/libavcodec/iff.c
> > +++ b/libavcodec/iff.c
> > @@ -284,7 +284,7 @@ static int extract_header(AVCodecContext *const avctx,
> >              if (s->bpp > 8) {
> >                  av_log(avctx, AV_LOG_ERROR, "Invalid number of hold bits for HAM: %u\n", s->ham);
> >                  return AVERROR_INVALIDDATA;
> > -            } if (s->ham != (s->bpp > 6 ? 6 : 4)) {
> > +            } else if (s->ham != (s->bpp > 6 ? 6 : 4)) {
> >                  av_log(avctx, AV_LOG_ERROR, "Invalid number of hold bits for HAM: %u, BPP: %u\n", s->ham, s->bpp);
> >                  return AVERROR_INVALIDDATA;
> >              }
> > -- 
> > 2.22.0
> 
> well spotted. please push.

will do

thanks

[...]

Patch hide | download patch | download mbox

diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index c6e2359b00..7f1c589d7c 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -284,7 +284,7 @@  static int extract_header(AVCodecContext *const avctx,
             if (s->bpp > 8) {
                 av_log(avctx, AV_LOG_ERROR, "Invalid number of hold bits for HAM: %u\n", s->ham);
                 return AVERROR_INVALIDDATA;
-            } if (s->ham != (s->bpp > 6 ? 6 : 4)) {
+            } else if (s->ham != (s->bpp > 6 ? 6 : 4)) {
                 av_log(avctx, AV_LOG_ERROR, "Invalid number of hold bits for HAM: %u, BPP: %u\n", s->ham, s->bpp);
                 return AVERROR_INVALIDDATA;
             }