From e8279880dcf7bed02cc1630f1e1582837f7e5eea Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Sat, 22 Aug 2015 06:16:31 +0100
Subject: [PATCH] acenctab: Fix merge conflict
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
---
libavcodec/aacenctab.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/aacenctab.c b/libavcodec/aacenctab.c
index b6ee0dee992..f3d70fbe31c 100644
--- 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);
--
GitLab