Changeset 688c3d94 in ffmpeg

Timestamp:

Dec 14, 2013, 12:09:30 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

54c596fe

Parents:

f5013913 (diff), c85aad9 (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/14/13 12:03:25)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/14/13 12:09:30)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: doxy: Define a group for libswscale documentation

Conflicts:

libavutil/avutil.h
libswscale/swscale.h

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

(No files)