diff options
| author | Michael Niedermayer <[email protected]> | 2014-10-06 15:04:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-10-06 15:04:03 +0200 |
| commit | a61899a0f13c0b8fca26472537cf60da04347c6d (patch) | |
| tree | f0fb8d03ea22d04afcc01df1b94ad6e973b32359 /tools | |
| parent | 067d11bf71e87d6bcc6a12eb302d6281a0d2408d (diff) | |
| parent | e3e158e81f0666b8fe66be9ce1cad63a535920e0 (diff) | |
Merge commit 'e3e158e81f0666b8fe66be9ce1cad63a535920e0'
* commit 'e3e158e81f0666b8fe66be9ce1cad63a535920e0':
vdpau: add av_vdpau_bind_context()
Conflicts:
doc/APIchanges
libavcodec/vdpau.h
libavcodec/version.h
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions