1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Merge remote-tracking branch 'qatar/master'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-17 19:37:33 +01:00
commit 9be63be1b2

View File

@ -140,7 +140,7 @@ AVStereo3D *av_stereo3d_alloc(void);
/**
* Allocate a complete AVFrameSideData and add it to the frame.
*
* @param The frame on which the side data is added to.
* @param frame The frame which side data is added to.
*
* @return The AVStereo3D structure to be filled by caller.
*/