Merge commit '80a4e6a46f21256e9bf508ead686563616945ad5'
authorJames Almer <jamrial@gmail.com>
Wed, 28 Mar 2018 18:36:25 +0000 (15:36 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 28 Mar 2018 18:37:40 +0000 (15:37 -0300)
commitc00579ab32aa620116c97dbc52c4c31418bc7fbb
tree03b3abe7923b7791276950d43a6ae21b2d3ad140
parent23ba9b3fd1fe8fe7a67387aaaff2b173bd7c3d2c
parent80a4e6a46f21256e9bf508ead686563616945ad5
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@gmail.com>