acenctab: Fix merge conflict
authorTimothy Gu <timothygu99@gmail.com>
Sat, 22 Aug 2015 05:16:31 +0000 (06:16 +0100)
committerRostislav Pehlivanov <atomnuker@gmail.com>
Sat, 22 Aug 2015 05:16:31 +0000 (06:16 +0100)
commite8279880dcf7bed02cc1630f1e1582837f7e5eea
treeee597eecd94aeec2290b9bb0d3569777350cf20a
parent21dd5279c3c48aec82fe566744b4a3fb4f729c60
acenctab: Fix merge conflict

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
libavcodec/aacenctab.c