diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2015-08-22 06:16:31 +0100 |
|---|---|---|
| committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2015-08-22 06:16:31 +0100 |
| commit | e8279880dcf7bed02cc1630f1e1582837f7e5eea (patch) | |
| tree | ee597eecd94aeec2290b9bb0d3569777350cf20a /libavcodec/aacenctab.c | |
| parent | 21dd5279c3c48aec82fe566744b4a3fb4f729c60 (diff) | |
| download | ffmpeg-e8279880dcf7bed02cc1630f1e1582837f7e5eea.tar.gz | |
acenctab: Fix merge conflict
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Diffstat (limited to 'libavcodec/aacenctab.c')
| -rw-r--r-- | libavcodec/aacenctab.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/aacenctab.c b/libavcodec/aacenctab.c index b6ee0dee99..f3d70fbe31 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); |