Merge commit '8a60bba0aef77015111570058d5a72f0428dc748'
authorJames Almer <jamrial@gmail.com>
Tue, 17 Oct 2017 21:49:36 +0000 (18:49 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 17 Oct 2017 21:49:36 +0000 (18:49 -0300)
* commit '8a60bba0aef77015111570058d5a72f0428dc748':
  avcodec: clarify some decoding/encoding API details

This commit is a noop, see f940492bb241d1cf27175f40e580c51c20d6ebc3

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

Trivial merge