Changeset 4fdf2fa9 in ffmpeg

Timestamp:

Sep 24, 2013, 1:53:50 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2599a62f

Parents:

1fb0d961 (diff), 58894ab3 (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 remote-tracking branch 'qatar/master'

• qatar/master: lavc: add support for interleaved chroma formats to libx264.

Conflicts:

libavcodec/libx264.c

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

(No files)