diff mbox

[FFmpeg-devel] lavc/pnmdec: Fix 16bit decoding

Message ID CAB0OVGoaJE4w64jy7dyedZjaw56zTjVKOQbBNha_5OgDVCLU3g@mail.gmail.com
State Accepted
Headers show

Commit Message

Carl Eugen Hoyos Dec. 13, 2019, 6:13 p.m. UTC 
Hi!

Attached patch fixes decoding a sample provided on irc.

Please comment, Carl Eugen

Comments

Michael Niedermayer Dec. 13, 2019, 10:06 p.m. UTC | #1 
On Fri, Dec 13, 2019 at 07:13:20PM +0100, Carl Eugen Hoyos wrote:
> Hi!
> 
> Attached patch fixes decoding a sample provided on irc.
> 
> Please comment, Carl Eugen

>  pnmdec.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> b5422d22058919ba63c80c3070660ab1f0908069  0001-lavc-pnmdec-Fix-16bit-decoding.patch
> From 9bf070aab1a88fb37db3c9322665edee9f90919f Mon Sep 17 00:00:00 2001
> From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> Date: Fri, 13 Dec 2019 19:10:15 +0100
> Subject: [PATCH] lavc/pnmdec: Fix 16bit decoding.
> 
> Regression since cdb5479c
> Reported by irc user tTh from Mixart-Myrys
> ---
>  libavcodec/pnmdec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c
> index 958c5e43b0..dbcaef3884 100644
> --- a/libavcodec/pnmdec.c
> +++ b/libavcodec/pnmdec.c
> @@ -143,7 +143,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data,
>                          v = (*s->bytestream++)&1;
>                      } else {
>                          /* read a sequence of digits */
> -                        for (k = 0; k < 5 && c <= 9; k += 1) {
> +                        for (k = 0; k < 6 && c <= 9; k += 1) {

should be ok

thx

[...]
Carl Eugen Hoyos Dec. 14, 2019, 8:56 a.m. UTC | #2 
Am Fr., 13. Dez. 2019 um 23:06 Uhr schrieb Michael Niedermayer
<michael@niedermayer.cc>:
>
> On Fri, Dec 13, 2019 at 07:13:20PM +0100, Carl Eugen Hoyos wrote:
> > Hi!
> >
> > Attached patch fixes decoding a sample provided on irc.
> >
> > Please comment, Carl Eugen
>
> >  pnmdec.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > b5422d22058919ba63c80c3070660ab1f0908069  0001-lavc-pnmdec-Fix-16bit-decoding.patch
> > From 9bf070aab1a88fb37db3c9322665edee9f90919f Mon Sep 17 00:00:00 2001
> > From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> > Date: Fri, 13 Dec 2019 19:10:15 +0100
> > Subject: [PATCH] lavc/pnmdec: Fix 16bit decoding.
> >
> > Regression since cdb5479c
> > Reported by irc user tTh from Mixart-Myrys
> > ---
> >  libavcodec/pnmdec.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c
> > index 958c5e43b0..dbcaef3884 100644
> > --- a/libavcodec/pnmdec.c
> > +++ b/libavcodec/pnmdec.c
> > @@ -143,7 +143,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data,
> >                          v = (*s->bytestream++)&1;
> >                      } else {
> >                          /* read a sequence of digits */
> > -                        for (k = 0; k < 5 && c <= 9; k += 1) {
> > +                        for (k = 0; k < 6 && c <= 9; k += 1) {
>
> should be ok

Patch applied.

Thank you, Carl Eugen
diff mbox

Patch

From 9bf070aab1a88fb37db3c9322665edee9f90919f Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Date: Fri, 13 Dec 2019 19:10:15 +0100
Subject: [PATCH] lavc/pnmdec: Fix 16bit decoding.

Regression since cdb5479c
Reported by irc user tTh from Mixart-Myrys
---
 libavcodec/pnmdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c
index 958c5e43b0..dbcaef3884 100644
--- a/libavcodec/pnmdec.c
+++ b/libavcodec/pnmdec.c
@@ -143,7 +143,7 @@  static int pnm_decode_frame(AVCodecContext *avctx, void *data,
                         v = (*s->bytestream++)&1;
                     } else {
                         /* read a sequence of digits */
-                        for (k = 0; k < 5 && c <= 9; k += 1) {
+                        for (k = 0; k < 6 && c <= 9; k += 1) {
                             v = 10*v + c;
                             c = (*s->bytestream++) - '0';
                         }
-- 
2.23.0