ffmpeg | branch: master | Timothy Gu <[email protected]> | Sat Aug 22 06:16:31 2015 +0100| [e8279880dcf7bed02cc1630f1e1582837f7e5eea] | committer: Rostislav Pehlivanov
acenctab: Fix merge conflict Signed-off-by: Rostislav Pehlivanov <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e8279880dcf7bed02cc1630f1e1582837f7e5eea --- libavcodec/aacenctab.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/aacenctab.c b/libavcodec/aacenctab.c index b6ee0de..f3d70fb 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); _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
