[FFmpeg-cvslog] Merge commit 'ea3320bb828553182fb34e164826f95df5743522'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Mar 30 15:43:42 2018 -0300| [0ac379863231dbf84a97a01845c6d00cc00610c1] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0ac379863231dbf84a97a01845c6d00cc00610c1
---