[FFmpeg-cvslog] Merge commit '85c2bf9d2cc7dad3d5c6dc79f802a74efa8d8fce'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Oct 30 16:57:28 2017 -0300| [644dd659c5c2927d5fb944718c32e61d88a0791b] | committer: James Almer

Merge commit '85c2bf9d2cc7dad3d5c6dc79f802a74efa8d8fce'

* commit '85c2bf9d2cc7dad3d5c6dc79f802a74efa8d8fce':
  avfoundation: update to use AVCodecParameters

This commit is a noop, see f1560dbb2a0089d63ca61a324673f7e2e30fb517

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

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