Changeset 9be63be1 in ffmpeg

Timestamp:

Dec 17, 2013, 6:37:50 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3e626548

Parents:

d6acf45e (diff), bd316109 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (12/17/13 18:37:33)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/17/13 18:37:50)

Message:

Merge remote-tracking branch 'qatar/master'

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

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

(No files)