[FFmpeg-cvslog] Merge commit '636515c324facaa14ccd8ab0732740a240a31ba9'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed Mar 29 14:24:20 2017 +0200| [63c41c53f355d4a00d4601e6ee014e9c3ad3c289] | committer: Clément Bœsch

Merge commit '636515c324facaa14ccd8ab0732740a240a31ba9'

* commit '636515c324facaa14ccd8ab0732740a240a31ba9':
  examples/decode_video: remove a stray unrelated comment

This commit is a noop, see 8c4753f7f5f1f65532e841cffa3b4fdb368c2fdf

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

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