[FFmpeg-cvslog] Merge commit '1a469a5e423bdad779b8534247dea8cc86169b88'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <cboesch at gopro.com> | Thu Mar 30 09:58:09 2017 +0200| [a48c0c41c4dee06d5d99afd02ebf683135b95f78] | committer: Clément Bœsch

Merge commit '1a469a5e423bdad779b8534247dea8cc86169b88'

* commit '1a469a5e423bdad779b8534247dea8cc86169b88':
  options_table: Remove a now unnecessary include of config.h

This commit is a noop, see 76f43cbe2648ac5cb0e5a146f7e843310002199a

Merged-by: Clément Bœsch <cboesch at gopro.com>

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