[FFmpeg-cvslog] Merge commit '80a4e6a46f21256e9bf508ead686563616945ad5'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Mar 28 15:36:25 2018 -0300| [c00579ab32aa620116c97dbc52c4c31418bc7fbb] | committer: James Almer

Merge commit '80a4e6a46f21256e9bf508ead686563616945ad5'

* commit '80a4e6a46f21256e9bf508ead686563616945ad5':
  amf: Replace writer_id option with LIBAV_AMF_WRITER_ID constant

This commit is a noop, see 9ea6607d294526688ab1b1342cb36ee159683e88

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

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