| Message ID | 20240630231306.3779027-11-michael@niedermayer.cc |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,01/11] MAINTAINERS: Add Timo Rothenpieler to server admins | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | fail | Make fate failed |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On 01/07/2024 01:12, Michael Niedermayer wrote: > Fixes: CID1605475 Logically dead code > > Sponsored-by: Sovereign Tech Fund > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavcodec/aac/aacdec_usac.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c > index 9587348021e..10121dbc34f 100644 > --- a/libavcodec/aac/aacdec_usac.c > +++ b/libavcodec/aac/aacdec_usac.c > @@ -1676,9 +1676,6 @@ int ff_aac_usac_decode_frame(AVCodecContext *avctx, AACDecContext *ac, > } else if (sbr_ratio == 3) { > ratio_mult = 2; > ratio_dec = 1; > - } else if (sbr_ratio == 4) { > - ratio_mult = 4; > - ratio_dec = 1; > } else { > ratio_mult = 1; > ratio_dec = 1; Its valid, just not supported at the moment. Maybe just error out with PATCHWELCOME? Or mark it as a false positive?
On Wed, Jul 03, 2024 at 02:49:57AM +0200, Lynne via ffmpeg-devel wrote: > On 01/07/2024 01:12, Michael Niedermayer wrote: > > Fixes: CID1605475 Logically dead code > > > > Sponsored-by: Sovereign Tech Fund > > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > > --- > > libavcodec/aac/aacdec_usac.c | 3 --- > > 1 file changed, 3 deletions(-) > > > > diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c > > index 9587348021e..10121dbc34f 100644 > > --- a/libavcodec/aac/aacdec_usac.c > > +++ b/libavcodec/aac/aacdec_usac.c > > @@ -1676,9 +1676,6 @@ int ff_aac_usac_decode_frame(AVCodecContext *avctx, AACDecContext *ac, > > } else if (sbr_ratio == 3) { > > ratio_mult = 2; > > ratio_dec = 1; > > - } else if (sbr_ratio == 4) { > > - ratio_mult = 4; > > - ratio_dec = 1; > > } else { > > ratio_mult = 1; > > ratio_dec = 1; > > Its valid, just not supported at the moment. Maybe just error out with > PATCHWELCOME? > Or mark it as a false positive? yeah, marked as false positive thx [...]
diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c index 9587348021e..10121dbc34f 100644 --- a/libavcodec/aac/aacdec_usac.c +++ b/libavcodec/aac/aacdec_usac.c @@ -1676,9 +1676,6 @@ int ff_aac_usac_decode_frame(AVCodecContext *avctx, AACDecContext *ac, } else if (sbr_ratio == 3) { ratio_mult = 2; ratio_dec = 1; - } else if (sbr_ratio == 4) { - ratio_mult = 4; - ratio_dec = 1; } else { ratio_mult = 1; ratio_dec = 1;
Fixes: CID1605475 Logically dead code Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/aac/aacdec_usac.c | 3 --- 1 file changed, 3 deletions(-)