From: James Almer <jamrial@gmail.com>
Date: Sun, 2 Sep 2018 22:20:36 +0000 (-0300)
Subject: Merge commit 'b93026777aada7742583d8c5ab079e9f4dfe9a5d'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=2d62e06ff6a9f3dbd78136c1dc4a315a727c6f00;p=ffmpeg

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>
---

2d62e06ff6a9f3dbd78136c1dc4a315a727c6f00