Michael Niedermayer
|
b05d50898f
|
Merge commit '440842c4eb1d7709654ec97cd687663d11ef499c'
* commit '440842c4eb1d7709654ec97cd687663d11ef499c':
stereo3d: add missing include guards
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-06-19 23:47:10 +02:00 |
|
Vittorio Giovara
|
440842c4eb
|
stereo3d: add missing include guards
|
2014-06-19 17:31:49 -04:00 |
|
Michael Niedermayer
|
9be63be1b2
|
Merge remote-tracking branch 'qatar/master'
* qatar/master:
apidoc: fix warning from stereo3d.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2013-12-17 19:37:50 +01:00 |
|
Vittorio Giovara
|
bd316109b3
|
apidoc: fix warning from stereo3d.h
|
2013-12-17 09:34:08 +01:00 |
|
Michael Niedermayer
|
7a60348053
|
Merge commit '7e244c68600f479270e979258e389ed5240885fb'
* commit '7e244c68600f479270e979258e389ed5240885fb':
avframe: add codec-independent stereoscopic metadata
Conflicts:
Changelog
libavutil/Makefile
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2013-12-09 21:33:51 +01:00 |
|
Vittorio Giovara
|
7e244c6860
|
avframe: add codec-independent stereoscopic metadata
|
2013-12-09 16:02:43 +01:00 |
|