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)
commit0ac379863231dbf84a97a01845c6d00cc00610c1
treebc9c7f0057dbae61b9d5c9d2c26e018ccac58d6e
parent53937c437105853d0c8dd9292a16096e7e621fb2
parentea3320bb828553182fb34e164826f95df5743522
Merge commit 'ea3320bb828553182fb34e164826f95df5743522'

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