Merge commit 'a5992a274ff5f6c4bec3445cb410da0adce8ef70' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 11 Aug 2014 16:36:21 +0000 (18:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 11 Aug 2014 16:38:27 +0000 (18:38 +0200)
commit90a1c5e95c3f6bedcb97adb211e6e2b9de17d234
tree547d9cb282c65b9a7ff4e0abe4422e587a613be5
parent45a529d805cf09d0d43342c925f38e3b56c3a6e5
parenta5992a274ff5f6c4bec3445cb410da0adce8ef70
Merge commit 'a5992a274ff5f6c4bec3445cb410da0adce8ef70' into release/2.2

* commit 'a5992a274ff5f6c4bec3445cb410da0adce8ef70':
  stereo3d: add missing include guards

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