acenctab: Fix merge conflict

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

acenctab: Fix merge conflict
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
e8279880 · Timothy Gu · Rostislav Pehlivanov · 21dd5279 · e8279880
Commit e8279880 authored Aug 22, 2015 by Timothy Gu Committed by Rostislav Pehlivanov Aug 22, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

aacenctab.c libavcodec/aacenctab.c +2 -2

No files found.
--- 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);