Changeset 0f630b7b in ffmpeg

Timestamp:

Apr 28, 2014, 10:52:05 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9c6eef6f

Parents:

2548f8a2 (diff), ed4b7571 (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> (04/28/14 22:48:25)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/28/14 22:52:05)

Message:

Merge commit 'ed4b757177f9b563412cdbc8ee3405d82e10fc05'

• commit 'ed4b757177f9b563412cdbc8ee3405d82e10fc05': dxva2_h264: add a workaround for old Intel GPUs

Conflicts:

doc/APIchanges
libavcodec/version.h

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

(No files)