[FFmpeg-devel] [PATCH] avcodec/adpcm: squelch uninitialized variable warnings

[FFmpeg-devel] [PATCH] avcodec/adpcm: squelch uninitialized variable warnings

[Peter Ross]

[-- Attachment #1.1: Type: text/plain, Size: 930 bytes --]

Fixes CID1655273 and CID1655274.
---
 libavcodec/adpcm.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 92ab248f3d..527384b86d 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -877,6 +877,9 @@ static int adpcm_sanyo_expand3(ADPCMChannelStatus *c, int bits)
         add = (11 * c->step) >> 1;
         c->step = 3 * c->step;
         break;
+    default:
+        av_assert0(0); /* never reach here when bits is 3-bit */
+        return 0;
     }
 
     if (sign)
@@ -934,6 +937,9 @@ static int adpcm_sanyo_expand4(ADPCMChannelStatus *c, int bits)
         add = (25 * c->step) >> 1;
         c->step = 5 * c->step;
         break;
+    default:
+        av_assert0(0); /* never reach here when bits is 4-bit */
+        return 0;
     }
 
     if (sign)
-- 
2.47.2

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
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".

Re: [FFmpeg-devel] [PATCH] avcodec/adpcm: squelch uninitialized variable warnings

[Andreas Rheinhardt]

Peter Ross:
> Fixes CID1655273 and CID1655274.
> ---
>  libavcodec/adpcm.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
> index 92ab248f3d..527384b86d 100644
> --- a/libavcodec/adpcm.c
> +++ b/libavcodec/adpcm.c
> @@ -877,6 +877,9 @@ static int adpcm_sanyo_expand3(ADPCMChannelStatus *c, int bits)
>          add = (11 * c->step) >> 1;
>          c->step = 3 * c->step;
>          break;
> +    default:
> +        av_assert0(0); /* never reach here when bits is 3-bit */
> +        return 0;
>      }
>  
>      if (sign)
> @@ -934,6 +937,9 @@ static int adpcm_sanyo_expand4(ADPCMChannelStatus *c, int bits)
>          add = (25 * c->step) >> 1;
>          c->step = 5 * c->step;
>          break;
> +    default:
> +        av_assert0(0); /* never reach here when bits is 4-bit */
> +        return 0;
>      }
>  
>      if (sign)
> 

Why not av_unreachable()?

- Andreas

_______________________________________________
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".