Changeset faa1d4b1 in ffmpeg

Timestamp:

Jun 23, 2014, 11:09:38 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

97511bc7

Parents:

f6e772f9 (diff), ab72eda (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 'ab72eda15e98197cf148abc08574206cfde0d9b0'

• commit 'ab72eda15e98197cf148abc08574206cfde0d9b0': pixfmt: mark the reserved values

Conflicts:

libavutil/version.h

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

(No files)