Merge commit 'ea3320bb828553182fb34e164826f95df5743522'
authorJames Almer <jamrial@gmail.com>
Fri, 30 Mar 2018 18:43:42 +0000 (15:43 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 30 Mar 2018 18:43:42 +0000 (15:43 -0300)
* commit 'ea3320bb828553182fb34e164826f95df5743522':
  libaomenc: fix profile setting
  avcodec: rename the AV1 profiles

This commit is a noop, see 99cc3cf7a26cd4113e5047034577027d8c6f07a2

Merged-by: James Almer <jamrial@gmail.com>

Trivial merge