Merge commit 'f912fd767e55bbb5a1554bd99bacab007659609c'
authorJames Almer <jamrial@gmail.com>
Thu, 13 Apr 2017 20:54:02 +0000 (17:54 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 13 Apr 2017 20:54:02 +0000 (17:54 -0300)
commit0050449a0744eed0d900073c9ea3e6b375abf0f7
tree8c575ca447036c9eecd10e183b268d4b52fa587b
parentb2798267c5507df594babca9ff0e8ba36bf0a342
parentf912fd767e55bbb5a1554bd99bacab007659609c
Merge commit 'f912fd767e55bbb5a1554bd99bacab007659609c'

* commit 'f912fd767e55bbb5a1554bd99bacab007659609c':
  Add missing #includes for standalone spherical-information-related headers
  fate: Add spherical and stereo3d mov tests
  avprobe: Allow specifying multiple stream entries to be shown

This commit is a noop.

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