[FFmpeg-cvslog] Merge commit 'a5992a274ff5f6c4bec3445cb410da0adce8ef70' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 11 18:36:21 2014 +0200| [90a1c5e95c3f6bedcb97adb211e6e2b9de17d234] | committer: Michael Niedermayer

Merge commit 'a5992a274ff5f6c4bec3445cb410da0adce8ef70' into release/2.2

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=90a1c5e95c3f6bedcb97adb211e6e2b9de17d234
---