Merge commit '075acbb6ff5740b2eea1bb7dd3afbc8e66e2ebf8'
authorJames Almer <jamrial@gmail.com>
Thu, 13 Apr 2017 20:31:15 +0000 (17:31 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 13 Apr 2017 20:31:15 +0000 (17:31 -0300)
commit7adfa7cdc6ddb873cacd211f4e18e28b3efbb3aa
tree8c575ca447036c9eecd10e183b268d4b52fa587b
parent7d3bb052c8b9756e6fd40c32a88627dc58b0bc50
parent075acbb6ff5740b2eea1bb7dd3afbc8e66e2ebf8
Merge commit '075acbb6ff5740b2eea1bb7dd3afbc8e66e2ebf8'

* commit '075acbb6ff5740b2eea1bb7dd3afbc8e66e2ebf8':
  lavu: Add a video section to Doxygen documentation

Merged-by: James Almer <jamrial@gmail.com>
libavutil/display.h
libavutil/stereo3d.h