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)
commit2a68d3b1a5082901a0678f7c15374053630757a9
treeb3ee5ac8938408d5511234fe658e74e48c187822
parentaac40dd6154da79fa28ac5a23b40edaec472009a
parent88f0cf8cd30c8ea283430e6710a7bd98bb9c0301
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@pkh.me>