Merge commit '440842c4eb1d7709654ec97cd687663d11ef499c'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Jun 2014 21:47:07 +0000 (23:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Jun 2014 21:47:10 +0000 (23:47 +0200)
commitb05d50898f5cad7487fb937c7b0372e6ac912745
tree4a65c9aad6d76a05476e196a8ea6e95f6df6202c
parent05d95c53a70f983c124da112553502f7bcfec640
parent440842c4eb1d7709654ec97cd687663d11ef499c
Merge commit '440842c4eb1d7709654ec97cd687663d11ef499c'

* commit '440842c4eb1d7709654ec97cd687663d11ef499c':
  stereo3d: add missing include guards

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/stereo3d.h