Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Dec 2013 18:37:33 +0000 (19:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Dec 2013 18:37:50 +0000 (19:37 +0100)
commit9be63be1b285aee4f9ef597f0284e91a2f25a386
treee0048dfc755566fb4583d4f8a601a76cd74e5ee9
parentd6acf45ec280be866698966947a0887841a6ea20
parentbd316109b33362dbaf2629c16e05bf65adbf8573
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  apidoc: fix warning from stereo3d.h

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