Changeset 2548f8a2 in ffmpeg

Timestamp:

Apr 28, 2014, 10:38:50 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0f630b7b

Parents:

fed0aceb (diff), 2fcef90b (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:37:51)

git-committer:

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

Message:

Merge commit '2fcef90bee98bffeff1d95b7197738f50c450d86'

• commit '2fcef90bee98bffeff1d95b7197738f50c450d86': dxva2_h264: set the correct ref frame index in the long slice struct

Conflicts:

libavcodec/dxva2_h264.c

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

(No files)