Merge commit 'b93026777aada7742583d8c5ab079e9f4dfe9a5d'
authorJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 22:20:36 +0000 (19:20 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 2 Sep 2018 22:20:36 +0000 (19:20 -0300)
* commit 'b93026777aada7742583d8c5ab079e9f4dfe9a5d':
  libfdk-aac: Use enum names instead of literal numbers for the output format

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavcodec/libfdk-aacenc.c

Simple merge