Changeset 9328ae48 in ffmpeg

Timestamp:

Jun 25, 2013, 8:51:19 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

11081ab6

Parents:

bad8f04b (diff), d9c89ef8 (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.

Message:

Merge commit 'd9c89ef86b9400e50c2486f9406fad15c85bab22'

• commit 'd9c89ef86b9400e50c2486f9406fad15c85bab22': cllc: Use outbuf in RGB and ARGB functions cllc: Implement YUV support

Conflicts:

libavcodec/cllc.c

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

(No files)