diff mbox series

[FFmpeg-devel,1/3] avcodec/speedhq: Replace always-true check by assert

Message ID AM7PR03MB6660CD1DA5D9CE0111D435FA8F739@AM7PR03MB6660.eurprd03.prod.outlook.com
State Accepted
Commit 7a5f7caee9ebd58a025bd804e89f33de9f217b2a
Headers show
Series [FFmpeg-devel,1/3] avcodec/speedhq: Replace always-true check by assert | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Andreas Rheinhardt Dec. 12, 2021, 3:42 p.m. UTC 
Should fix Coverity tickets #1473572 and #1473504.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/speedhq.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Andreas Rheinhardt Dec. 15, 2021, 3:58 p.m. UTC | #1 
Andreas Rheinhardt:
> Should fix Coverity tickets #1473572 and #1473504.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavcodec/speedhq.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c
> index 91ba80ebd3..743dacc6ce 100644
> --- a/libavcodec/speedhq.c
> +++ b/libavcodec/speedhq.c
> @@ -295,7 +295,8 @@ static int decode_speedhq_border(const SHQContext *s, GetBitContext *gb, AVFrame
>          if (s->subsampling == SHQ_SUBSAMPLING_420) {
>              dest_cb = frame->data[1] + frame->linesize[1] * (y/2 + field_number) + x / 2;
>              dest_cr = frame->data[2] + frame->linesize[2] * (y/2 + field_number) + x / 2;
> -        } else if (s->subsampling == SHQ_SUBSAMPLING_422) {
> +        } else {
> +            av_assert2(s->subsampling == SHQ_SUBSAMPLING_422);
>              dest_cb = frame->data[1] + frame->linesize[1] * (y + field_number) + x / 2;
>              dest_cr = frame->data[2] + frame->linesize[2] * (y + field_number) + x / 2;
>          }
> 

Will apply this patchset later tonight unless there are objections.

- Andreas
diff mbox series

Patch

diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c
index 91ba80ebd3..743dacc6ce 100644
--- a/libavcodec/speedhq.c
+++ b/libavcodec/speedhq.c
@@ -295,7 +295,8 @@  static int decode_speedhq_border(const SHQContext *s, GetBitContext *gb, AVFrame
         if (s->subsampling == SHQ_SUBSAMPLING_420) {
             dest_cb = frame->data[1] + frame->linesize[1] * (y/2 + field_number) + x / 2;
             dest_cr = frame->data[2] + frame->linesize[2] * (y/2 + field_number) + x / 2;
-        } else if (s->subsampling == SHQ_SUBSAMPLING_422) {
+        } else {
+            av_assert2(s->subsampling == SHQ_SUBSAMPLING_422);
             dest_cb = frame->data[1] + frame->linesize[1] * (y + field_number) + x / 2;
             dest_cr = frame->data[2] + frame->linesize[2] * (y + field_number) + x / 2;
         }