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)
commit2d62e06ff6a9f3dbd78136c1dc4a315a727c6f00
tree82f4a0be6bf807f3cbdd930844aac86611676d91
parent3eea8edf618079e44719fe059ddd953b21ef1ba9
parentb93026777aada7742583d8c5ab079e9f4dfe9a5d
Merge commit 'b93026777aada7742583d8c5ab079e9f4dfe9a5d'

* commit 'b93026777aada7742583d8c5ab079e9f4dfe9a5d':
  libfdk-aac: Use enum names instead of literal numbers for the output format

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