[FFmpeg-cvslog] Merge commit '88f0cf8cd30c8ea283430e6710a7bd98bb9c0301'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Thu Mar 30 23:23:40 2017 +0200| [2a68d3b1a5082901a0678f7c15374053630757a9] | committer: Clément Bœsch

Merge commit '88f0cf8cd30c8ea283430e6710a7bd98bb9c0301'

* commit '88f0cf8cd30c8ea283430e6710a7bd98bb9c0301':
  avplay: Correct function pointer assignments in options array

This commit is a noop, see a9a1bc56abf1fa79104996bf7b98b12ca42cd32c

Merged-by: Clément Bœsch <u at pkh.me>

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