[FFmpeg-cvslog] Merge commit 'fea4dc05b41f5465bedc786b67966f204ec6150c'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Mar 31 17:18:37 2017 -0300| [99fa2fc5db06f842fdf91008fcc1e352cbe9e9dc] | committer: James Almer

Merge commit 'fea4dc05b41f5465bedc786b67966f204ec6150c'

* commit 'fea4dc05b41f5465bedc786b67966f204ec6150c':
  vc1: Return stream format information from parser

This commit is a noop, see 4df6605da7e351116c99f19b8a98e1f236932600

Merged-by: James Almer <jamrial at gmail.com>

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