[FFmpeg-cvslog] Merge commit '15fcf6292ed79be274c824fedb099c2665f4cc15'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Mon Mar 20 18:30:03 2017 +0100| [6d43533286fa14cf27f2217faab75a51c9ca30d2] | committer: Clément Bœsch

Merge commit '15fcf6292ed79be274c824fedb099c2665f4cc15'

* commit '15fcf6292ed79be274c824fedb099c2665f4cc15':
  build: remove hardcoded name of version header

This commit is noop, our version.sh is completely different.

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

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