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)
* commit '3f128fc4a3fa1ef8a87974eb5484a997a84868fe':
  vf_showinfo: Simplify reporting stereo3d information

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

Simple merge