dnxhddec: better support for 4:4:4

[ffmpeg] / libavcodec / aacenctab.c

diff --git a/libavcodec/aacenctab.c b/libavcodec/aacenctab.c
index 39e83760210e2c1178f808c25836174e3d8a33d1..f3d70fbe31cf544e3ae9691997fcbc69d82346c4 100644 (file)
--- a/libavcodec/aacenctab.c
+++ b/libavcodec/aacenctab.c
@@ -88,7 +88,7 @@ static const uint8_t swb_size_1024_8[] = {
     32, 36, 36, 40, 44, 48, 52, 56, 60, 64, 80
 };
 
-const uint8_t *swb_size_128[] = {
+const uint8_t *ff_aac_swb_size_128[] = {
     swb_size_128_96, swb_size_128_96, swb_size_128_64,
     swb_size_128_48, swb_size_128_48, swb_size_128_48,
     swb_size_128_24, swb_size_128_24, swb_size_128_16,
@@ -96,7 +96,7 @@ const uint8_t *swb_size_128[] = {
     swb_size_128_8
 };
 
-const uint8_t *swb_size_1024[] = {
+const uint8_t *ff_aac_swb_size_1024[] = {
     swb_size_1024_96, swb_size_1024_96, swb_size_1024_64,
     swb_size_1024_48, swb_size_1024_48, swb_size_1024_32,
     swb_size_1024_24, swb_size_1024_24, swb_size_1024_16,
@@ -104,5 +104,5 @@ const uint8_t *swb_size_1024[] = {
     swb_size_1024_8
 };
 
-const int swb_size_128_len  = sizeof(swb_size_128)/sizeof(*swb_size_128);
-const int swb_size_1024_len = sizeof(swb_size_1024)/sizeof(*swb_size_1024);
+const int ff_aac_swb_size_128_len  = FF_ARRAY_ELEMS(ff_aac_swb_size_128);
+const int ff_aac_swb_size_1024_len = FF_ARRAY_ELEMS(ff_aac_swb_size_1024);