Changeset 0a1cc04e in ffmpeg

Timestamp:

Apr 9, 2014, 1:07:47 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ed962414

Parents:

352e13e2 (diff), 8b17243d (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 '8b17243d1742279bcb2368f8d325ea71e66736c8'

• commit '8b17243d1742279bcb2368f8d325ea71e66736c8': lavu: Add packed YVYU422 pixel format

Conflicts:

libavutil/version.h

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

(No files)