Changeset 4e276b84 in ffmpeg

Timestamp:

Jan 6, 2014, 2:17:34 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

59725592

Parents:

b7697d29 (diff), 8058284c (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 '8058284ce09030b47512746d726fb2ad3ae8a20f'

• commit '8058284ce09030b47512746d726fb2ad3ae8a20f': lavc: add 422/444 YUV with alpha to align_dimensions()

Conflicts:

libavcodec/utils.c

Only cosmetical changes happen as these formats already where in the list before

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

(No files)