acenctab: Fix merge conflict
authorTimothy Gu <timothygu99@gmail.com>
Sat, 22 Aug 2015 05:16:31 +0000 (06:16 +0100)
committerRostislav Pehlivanov <atomnuker@gmail.com>
Sat, 22 Aug 2015 05:16:31 +0000 (06:16 +0100)
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
libavcodec/aacenctab.c

index b6ee0de..f3d70fb 100644 (file)
@@ -104,5 +104,5 @@ const uint8_t *ff_aac_swb_size_1024[] = {
     swb_size_1024_8
 };
 
-const int swb_size_128_len  = FF_ARRAY_ELEMS(ff_aac_swb_size_128);
-const int swb_size_1024_len = FF_ARRAY_ELEMS(ff_aac_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);