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)
* commit 'a5992a274ff5f6c4bec3445cb410da0adce8ef70':
  stereo3d: add missing include guards

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

Simple merge