Changeset 8733b363 in ffmpeg

Timestamp:

Nov 23, 2013, 11:10:40 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2e5780a5

Parents:

97a0bad (diff), c16bfb1 (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> (11/23/13 11:01:42)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/23/13 11:10:40)

Message:

Merge commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949'

• commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949': swscale: x86: Consistently use lowercase function name suffixes

Conflicts:

libswscale/x86/rgb2rgb.c
libswscale/x86/swscale.c

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

(No files)