Message ID | GV1SPRMB0033E47B9F06DECAA7CD13188FA7A@GV1SPRMB0033.EURP250.PROD.OUTLOOK.COM |
---|---|
State | Accepted |
Commit | 5935423e1e8bf02362590ee5843f0a869872af9e |
Headers | show |
Series | [FFmpeg-devel,01/11] avcodec/aactab: Deduplicate swb_offset_960 tabs | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
Andreas Rheinhardt: > swb_offset_960_48 and swb_offset_960_32 coincide. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavcodec/aactab.c | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-) > > diff --git a/libavcodec/aactab.c b/libavcodec/aactab.c > index d20ac56a3f..63a478f33f 100644 > --- a/libavcodec/aactab.c > +++ b/libavcodec/aactab.c > @@ -1331,14 +1331,7 @@ static const uint16_t swb_offset_960_48[] = > 672, 704, 736, 768, 800, 832, 864, 896, 928, 960 > }; > > -static const uint16_t swb_offset_960_32[] = > -{ > - 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, > - 40, 48, 56, 64, 72, 80, 88, 96, 108, 120, > - 132, 144, 160, 176, 196, 216, 240, 264, 292, 320, > - 352, 384, 416, 448, 480, 512, 544, 576, 608, 640, > - 672, 704, 736, 768, 800, 832, 864, 896, 928, 960 > -}; > +#define swb_offset_960_32 swb_offset_960_48 > > static const uint16_t swb_offset_960_24[] = > { Will apply this patchset tomorrow unless there are objections. - Andreas
diff --git a/libavcodec/aactab.c b/libavcodec/aactab.c index d20ac56a3f..63a478f33f 100644 --- a/libavcodec/aactab.c +++ b/libavcodec/aactab.c @@ -1331,14 +1331,7 @@ static const uint16_t swb_offset_960_48[] = 672, 704, 736, 768, 800, 832, 864, 896, 928, 960 }; -static const uint16_t swb_offset_960_32[] = -{ - 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, - 40, 48, 56, 64, 72, 80, 88, 96, 108, 120, - 132, 144, 160, 176, 196, 216, 240, 264, 292, 320, - 352, 384, 416, 448, 480, 512, 544, 576, 608, 640, - 672, 704, 736, 768, 800, 832, 864, 896, 928, 960 -}; +#define swb_offset_960_32 swb_offset_960_48 static const uint16_t swb_offset_960_24[] = {
swb_offset_960_48 and swb_offset_960_32 coincide. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/aactab.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)