Changeset a9bd29e1 in ffmpeg

Timestamp:

Jan 10, 2012, 10:12:24 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0e7fc3ca

Parents:

f4a01d77 (diff), 296a3382 (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> (01/10/12 22:12:21)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/10/12 22:12:24)

Message:

Merge remote-tracking branch 'richardpl/sws'

• richardpl/sws: rgb2rgb: remove unused bgr8torgb8() rgb2rgb: rgb12tobgr12() rgb2rgb: allow conversion for <15 bpp bmpenc: support for PIX_FMT_RGB444 bmpdec: support for rgb444 with bitfields compression

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

(No files)