Changeset 0da0caa9 in ffmpeg

Timestamp:

Jul 12, 2013, 11:47:37 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

73f940e4

Parents:

e9348e10 (diff), c0d973c4 (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> (07/12/13 11:40:12)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/12/13 11:47:37)

Message:

Merge commit 'c0d973c41b4568d5bad1295879e35cfa611bdcf2'

• commit 'c0d973c41b4568d5bad1295879e35cfa611bdcf2': vdpau: use the correct namespace for the union

Conflicts:

libavcodec/vdpau.h

See: 68dfe530e0fb03b4d21dfe37f8a572b95c68485e

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

(No files)