Merge commit '3f128fc4a3fa1ef8a87974eb5484a997a84868fe'
authorJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 21:49:22 +0000 (18:49 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 21:49:22 +0000 (18:49 -0300)
commit69bb3f7bffa20b843efb1b52514bb8e65362936c
tree6d553955b55d98455d155e1bde9e86a7c366e114
parent2f4677a11fd9de98851886841e55c89a655f2605
parent3f128fc4a3fa1ef8a87974eb5484a997a84868fe
Merge commit '3f128fc4a3fa1ef8a87974eb5484a997a84868fe'

* commit '3f128fc4a3fa1ef8a87974eb5484a997a84868fe':
  vf_showinfo: Simplify reporting stereo3d information

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