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

2019-07-14 Thread Michael Niedermayer 
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 
> > ---
> >  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

[...]

-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Never trust a computer, one day, it may think you are the virus. -- Compn


signature.asc
Description: PGP signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

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

2019-07-13 Thread Peter Ross 
On Sat, Jul 13, 2019 at 10:25:01PM +0200, Michael Niedermayer wrote:
> Signed-off-by: Michael Niedermayer 
> ---
>  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)


signature.asc
Description: PGP signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

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

2019-07-13 Thread Michael Niedermayer 
Signed-off-by: Michael Niedermayer 
---
 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

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".