Changeset 3428a9b8 in ffmpeg

Timestamp:

Apr 2, 2014, 3:46:19 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

91a0d3a

Parents:

cecb6d6f (diff), 0ca0924c (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> (04/02/14 11:15:04)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/02/14 15:46:19)

Message:

Merge commit '0ca0924c10d9617a5793964bf79655424ef32b68'

• commit '0ca0924c10d9617a5793964bf79655424ef32b68': swscale: add endianness conversion for AV_PIX_FMT_BGRA64|RGBA64

Conflicts:

libswscale/swscale_unscaled.c
libswscale/utils.c

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

(No files)