[FFmpeg-cvslog] Merge commit 'e3e158e81f0666b8fe66be9ce1cad63a535920e0'
Michael Niedermayer
git at videolan.org
Mon Oct 6 15:10:38 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 6 15:04:03 2014 +0200| [a61899a0f13c0b8fca26472537cf60da04347c6d] | committer: Michael Niedermayer
Merge commit 'e3e158e81f0666b8fe66be9ce1cad63a535920e0'
* commit 'e3e158e81f0666b8fe66be9ce1cad63a535920e0':
vdpau: add av_vdpau_bind_context()
Conflicts:
doc/APIchanges
libavcodec/vdpau.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a61899a0f13c0b8fca26472537cf60da04347c6d
---
More information about the ffmpeg-cvslog
mailing list