Changeset 01cac26f in ffmpeg

Timestamp:

Aug 29, 2013, 1:56:03 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

99e7c702

Parents:

c49b6c3d (diff), 1909f6b1 (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> (08/29/13 13:54:14)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (08/29/13 13:56:03)

Message:

Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'

• commit '1909f6b1b6da2db371c179bed5a19aaf979b7557': swscale: cosmetics: Drop silly camelCase from swScale function pointer name

Conflicts:

libswscale/swscale_unscaled.c

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

(No files)