Merge commit '883ce264d9ffc5bdaf477e09ee155b03339c46a6'
authorJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 21:51:34 +0000 (18:51 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 21:51:34 +0000 (18:51 -0300)
commit0acb18d298721a75f433b49030204f59b6544f27
treecf6cfc4b5ed85210488f18001389848ebe38a883
parent69bb3f7bffa20b843efb1b52514bb8e65362936c
parent883ce264d9ffc5bdaf477e09ee155b03339c46a6
Merge commit '883ce264d9ffc5bdaf477e09ee155b03339c46a6'

* commit '883ce264d9ffc5bdaf477e09ee155b03339c46a6':
  vf_showinfo: Display spherical properties

Merged-by: James Almer <jamrial@gmail.com>
libavfilter/vf_showinfo.c