Merge commit '88f0cf8cd30c8ea283430e6710a7bd98bb9c0301'
authorClément Bœsch <u@pkh.me>
Thu, 30 Mar 2017 21:23:40 +0000 (23:23 +0200)
committerClément Bœsch <u@pkh.me>
Thu, 30 Mar 2017 21:23:40 +0000 (23:23 +0200)
* commit '88f0cf8cd30c8ea283430e6710a7bd98bb9c0301':
  avplay: Correct function pointer assignments in options array

This commit is a noop, see a9a1bc56abf1fa79104996bf7b98b12ca42cd32c

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

Trivial merge