[FFmpeg-cvslog] Merge commit '8a60bba0aef77015111570058d5a72f0428dc748'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Oct 17 18:49:36 2017 -0300| [a41a5733d1a439d4920fff6239c2ebaafa338123] | committer: James Almer

Merge commit '8a60bba0aef77015111570058d5a72f0428dc748'

* commit '8a60bba0aef77015111570058d5a72f0428dc748':
  avcodec: clarify some decoding/encoding API details

This commit is a noop, see f940492bb241d1cf27175f40e580c51c20d6ebc3

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

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