Merge commit 'fea4dc05b41f5465bedc786b67966f204ec6150c'
authorJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 20:18:37 +0000 (17:18 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 20:18:37 +0000 (17:18 -0300)
commit99fa2fc5db06f842fdf91008fcc1e352cbe9e9dc
treea7980a8023a2e4f1e9d5d1994642be1496f68601
parent4fe9d6964830f0eec94165da02c95cc2669fdfe1
parentfea4dc05b41f5465bedc786b67966f204ec6150c
Merge commit 'fea4dc05b41f5465bedc786b67966f204ec6150c'

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

This commit is a noop, see 4df6605da7e351116c99f19b8a98e1f236932600

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