acenctab: Fix merge conflict

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
10 years ago · e8279880dc
parent 21dd5279c3
commit e8279880dc
1 changed files with 2 additions and 2 deletions
--- a/libavcodec/aacenctab.c
+++ b/libavcodec/aacenctab.c
@ -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);