Changeset 99bcfe6 in ffmpeg

Timestamp:

Feb 19, 2015, 8:12:33 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

dfe5a9f

Parents:

ac649bb7 (diff), 0fbb2713 (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> (02/19/15 20:12:29)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/19/15 20:12:33)

Message:

Merge commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23'

• commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23': qsv_api: fix building with libmfx disabled

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

(No files)