RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

acenctab: Fix merge conflict 

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
This commit is contained in:
Timothy Gu 2015-08-22 06:16:31 +01:00 committed by Rostislav Pehlivanov
parent 21dd5279c3
commit e8279880dc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/aacenctab.c
View 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);