Changeset 5460ab73 in ffmpeg

Timestamp:

May 12, 2014, 12:44:28 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

96abdf2

Parents:

28563327 (diff), 1839fafa (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> (05/12/14 00:34:01)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/12/14 00:44:28)

Message:

Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'

• commit '1839fafa951308237c4672ffd9a94f927b26eac7': avconv: Support VDA hwaccel

Conflicts:

Makefile

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

(No files)