[FFmpeg-devel] [PATCH] avcodec/vqavideo: Remove dead code

Andreas Rheinhardt andreas.rheinhardt at outlook.com
Sat Nov 27 19:30:18 EET 2021


Andreas Rheinhardt:
> Fixes Coverity issue #1493344.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> ---
>  libavcodec/vqavideo.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c
> index 5466e25cdf..61f0a2c950 100644
> --- a/libavcodec/vqavideo.c
> +++ b/libavcodec/vqavideo.c
> @@ -692,11 +692,6 @@ static int vqa_decode_frame_hicolor(VqaContext *s, AVFrame *frame)
>          bytestream2_get_buffer(&s->gb, s->codebook, chunk_size);
>      }
>  
> -    if (vprz_chunk == -1 && vptr_chunk == -1) {
> -        av_log(s->avctx, AV_LOG_ERROR, "frame has no block data\n");
> -        return AVERROR_INVALIDDATA;
> -    }
> -
>      /* decode the frame */
>  
>      if (vptr_chunk != -1) {
> @@ -716,7 +711,7 @@ static int vqa_decode_frame_hicolor(VqaContext *s, AVFrame *frame)
>          if ((res = decode_format80(s, chunk_size, s->decode_buffer, s->decode_buffer_size, 0)) < 0)
>              return res;
>      } else {
> -        av_log(s->avctx, AV_LOG_ERROR, "expected either VPTR or VPRZ chunk\n");
> +        av_log(s->avctx, AV_LOG_ERROR, "frame has no block data\n");
>          return AVERROR_INVALIDDATA;
>      }
>  
> 
Will apply tomorrow unless there are objections.

- Andreas


More information about the ffmpeg-devel mailing list