[FFmpeg-cvslog] Merge commit 'd31f46e1999fab31be46f0cbce0546a5aa49fe48'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <cboesch at gopro.com> | Fri May  5 10:36:48 2017 +0200| [21f17bbfd4523ed769b5b0b569f5961914b2d6bc] | committer: Clément Bœsch

Merge commit 'd31f46e1999fab31be46f0cbce0546a5aa49fe48'

* commit 'd31f46e1999fab31be46f0cbce0546a5aa49fe48':
  cmdutils: update copyright year to 2017

This commit is a noop, see d800d48fc67208819c2a4ae5eb214ca5e3ad7e82

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

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