Changeset ed962414 in ffmpeg

Timestamp:

Apr 9, 2014, 1:36:38 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

233dbee3

Parents:

0a1cc04e (diff), 92b099da (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/09/14 01:20:52)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/09/14 01:36:38)

Message:

Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3'

• commit '92b099daf4b8ef93513e38b43899cb8458a2fde3': swscale: support converting YVYU422 pixel format

Conflicts:

libswscale/input.c

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

(No files)