| Message ID | 20240510140705.443047-2-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | 4ed4f9a6c0a99c823706bfc4bb4df53f963f2f5a |
| Headers | show |
| Series | [FFmpeg-devel,1/3] avcodec/ilbcdec: Remove dead code | expand |
fre 2024-05-10 klockan 16:07 +0200 skrev Michael Niedermayer: > Fixes: CID1460979 Logically dead code > > Sponsored-by: Sovereign Tech Fund > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/jpeg2000dec.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c > index 28bf6be2fef..135537b52fb 100644 > --- a/libavcodec/jpeg2000dec.c > +++ b/libavcodec/jpeg2000dec.c > @@ -835,9 +835,6 @@ static int get_tlm(Jpeg2000DecoderContext *s, int > n) > case 2: > bytestream2_get_be16(&s->g); > break; > - case 3: > - bytestream2_get_be32(&s->g); > - break; Double-checked T.800 table A.34 and indeed ST == 3 is invalid (which is also checked just above). So looks OK. /Tomas
fre 2024-05-10 klockan 16:07 +0200 skrev Michael Niedermayer: > Fixes: CID1460979 Logically dead code > > Sponsored-by: Sovereign Tech Fund > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/jpeg2000dec.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c > index 28bf6be2fef..135537b52fb 100644 > --- a/libavcodec/jpeg2000dec.c > +++ b/libavcodec/jpeg2000dec.c > @@ -835,9 +835,6 @@ static int get_tlm(Jpeg2000DecoderContext *s, int > n) > case 2: > bytestream2_get_be16(&s->g); > break; > - case 3: > - bytestream2_get_be32(&s->g); > - break; I will also point out get_tlm() doesn't actually do anything other than advance the bytestream. We could just as well advance by Ltlm /Tomas
mån 2024-05-13 klockan 10:51 +0200 skrev Tomas Härdin: > fre 2024-05-10 klockan 16:07 +0200 skrev Michael Niedermayer: > > Fixes: CID1460979 Logically dead code > > > > Sponsored-by: Sovereign Tech Fund > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > > --- > > libavcodec/jpeg2000dec.c | 3 --- > > 1 file changed, 3 deletions(-) > > > > diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c > > index 28bf6be2fef..135537b52fb 100644 > > --- a/libavcodec/jpeg2000dec.c > > +++ b/libavcodec/jpeg2000dec.c > > @@ -835,9 +835,6 @@ static int get_tlm(Jpeg2000DecoderContext *s, > > int > > n) > > case 2: > > bytestream2_get_be16(&s->g); > > break; > > - case 3: > > - bytestream2_get_be32(&s->g); > > - break; > > I will also point out get_tlm() doesn't actually do anything other > than > advance the bytestream. We could just as well advance by Ltlm Correction: it does validate that the TLM marker is correctly formatted, so that's something at least /Tomas
On Mon, May 13, 2024 at 10:35:44AM +0200, Tomas Härdin wrote: > fre 2024-05-10 klockan 16:07 +0200 skrev Michael Niedermayer: > > Fixes: CID1460979 Logically dead code > > > > Sponsored-by: Sovereign Tech Fund > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > > --- > > libavcodec/jpeg2000dec.c | 3 --- > > 1 file changed, 3 deletions(-) > > > > diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c > > index 28bf6be2fef..135537b52fb 100644 > > --- a/libavcodec/jpeg2000dec.c > > +++ b/libavcodec/jpeg2000dec.c > > @@ -835,9 +835,6 @@ static int get_tlm(Jpeg2000DecoderContext *s, int > > n) > > case 2: > > bytestream2_get_be16(&s->g); > > break; > > - case 3: > > - bytestream2_get_be32(&s->g); > > - break; > > Double-checked T.800 table A.34 and indeed ST == 3 is invalid (which is > also checked just above). So looks OK. will apply thx [...]
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 28bf6be2fef..135537b52fb 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -835,9 +835,6 @@ static int get_tlm(Jpeg2000DecoderContext *s, int n) case 2: bytestream2_get_be16(&s->g); break; - case 3: - bytestream2_get_be32(&s->g); - break; } if (SP == 0) { bytestream2_get_be16(&s->g);
Fixes: CID1460979 Logically dead code Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/jpeg2000dec.c | 3 --- 1 file changed, 3 deletions(-)