Changeset 841e9f43 in ffmpeg

Timestamp:

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

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ac649bb7

Parents:

560eb717 (diff), 4e08c821 (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 19:52:29)

git-committer:

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

Message:

Merge commit '4e08c821106fc1d6d358864abf0d8488b12f38c6'

• commit '4e08c821106fc1d6d358864abf0d8488b12f38c6': lavc: add an Intel libmfx-based H.264 decoder

Conflicts:

configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h

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

(No files)