[FFmpeg-cvslog] Merge commit '943533d64c7fa7a1b2fc9559e67652c349d21d51'

[Clément Bœsch]

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

Merge commit '943533d64c7fa7a1b2fc9559e67652c349d21d51'

* commit '943533d64c7fa7a1b2fc9559e67652c349d21d51':
  avconv: Correct function pointer assignments in options array

This commit is a noop, see 4c96985af1b8870482b6b6ef9120960633f62cee

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

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