]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23ba9b3 80a4e6a)
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)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.