diff mbox series

[FFmpeg-devel,1/3] avcodec/vp3: Don't output bogus warning

Message ID AM7PR03MB6660CB1767C737BD5841B5748F4F9@AM7PR03MB6660.eurprd03.prod.outlook.com
State Accepted
Commit 46309f262c97ec125857897df1dfb76826e538c6
Headers show
Series [FFmpeg-devel,1/3] avcodec/vp3: Don't output bogus warning | 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
andriy/make_armv7_RPi4 success Make finished
andriy/make_fate_armv7_RPi4 success Make fate finished

Commit Message

Andreas Rheinhardt Jan. 9, 2022, 8:15 p.m. UTC 
It is perfectly fine to have from one to seven bits left
at the end of parsing.

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

Comments

Andreas Rheinhardt Jan. 12, 2022, 9:51 a.m. UTC | #1 
Andreas Rheinhardt:
> It is perfectly fine to have from one to seven bits left
> at the end of parsing.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavcodec/vp3.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
> index 5b9ba60f49..791e531862 100644
> --- a/libavcodec/vp3.c
> +++ b/libavcodec/vp3.c
> @@ -3149,10 +3149,10 @@ static av_cold int theora_decode_init(AVCodecContext *avctx)
>                     "Unknown Theora config packet: %d\n", ptype & ~0x80);
>              break;
>          }
> -        if (ptype != 0x81 && 8 * header_len[i] != get_bits_count(&gb))
> +        if (ptype != 0x81 && get_bits_left(&gb) >= 8U)
>              av_log(avctx, AV_LOG_WARNING,
>                     "%d bits left in packet %X\n",
> -                   8 * header_len[i] - get_bits_count(&gb), ptype);
> +                   get_bits_left(&gb), ptype);
>          if (s->theora < 0x030200)
>              break;
>      }
> 

Will apply this patchset tomorrow unless there are objections.

- Andreas
diff mbox series

Patch

diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 5b9ba60f49..791e531862 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -3149,10 +3149,10 @@  static av_cold int theora_decode_init(AVCodecContext *avctx)
                    "Unknown Theora config packet: %d\n", ptype & ~0x80);
             break;
         }
-        if (ptype != 0x81 && 8 * header_len[i] != get_bits_count(&gb))
+        if (ptype != 0x81 && get_bits_left(&gb) >= 8U)
             av_log(avctx, AV_LOG_WARNING,
                    "%d bits left in packet %X\n",
-                   8 * header_len[i] - get_bits_count(&gb), ptype);
+                   get_bits_left(&gb), ptype);
         if (s->theora < 0x030200)
             break;
     }