Merge commit 'c7bf98d4372e9217c8d75d2ca1f298385909e4da'
authorJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 20:14:39 +0000 (17:14 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 20:14:39 +0000 (17:14 -0300)
commitf3ccc5e22acdd5f4eff7f875981a2209b6f2aa66
tree792f73e38fac802369f02a9beb76b76fd4c3ec72
parent623a0526282f97c567c6bfc669828d7382abe0ad
parentc7bf98d4372e9217c8d75d2ca1f298385909e4da
Merge commit 'c7bf98d4372e9217c8d75d2ca1f298385909e4da'

* commit 'c7bf98d4372e9217c8d75d2ca1f298385909e4da':
  avprobe: use av_spherical_projection_name() to print spherical projection names
  dump: use av_spherical_projection_name() to print spherical projection names
  spherical: add functions to retrieve and request projection names

This commit is a noop, see
9033e8723c86ed31872b22bd576602d48e2b9d0e
2efb70c37992b16b589e7405cd36e2f15a34c8ec
2a2854f57842e843ae0d4bd0ebe617135b2f63a0

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