summaryrefslogtreecommitdiff
path: root/libavutil/stereo3d.h
Commit message (Collapse)AuthorAge
* Merge commit '440842c4eb1d7709654ec97cd687663d11ef499c'Michael Niedermayer2014-06-19
|\ | | | | | | | | | | | | * commit '440842c4eb1d7709654ec97cd687663d11ef499c': stereo3d: add missing include guards Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * stereo3d: add missing include guardsVittorio Giovara2014-06-19
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-12-17
|\| | | | | | | | | | | | | * qatar/master: apidoc: fix warning from stereo3d.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * apidoc: fix warning from stereo3d.hVittorio Giovara2013-12-17
| |
* | Merge commit '7e244c68600f479270e979258e389ed5240885fb'Michael Niedermayer2013-12-09
|/ | | | | | | | | | | | * commit '7e244c68600f479270e979258e389ed5240885fb': avframe: add codec-independent stereoscopic metadata Conflicts: Changelog libavutil/Makefile libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* avframe: add codec-independent stereoscopic metadataVittorio Giovara2013-12-09