[FFmpeg-cvslog] Merge commit 'c0d973c41b4568d5bad1295879e35cfa611bdcf2'
Michael Niedermayer
git at videolan.org
Fri Jul 12 13:48:40 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 12 13:40:12 2013 +0200| [0da0caa9a9ea1a2d7471f51a11fd90c08fbcd3fb] | committer: Michael Niedermayer
Merge commit 'c0d973c41b4568d5bad1295879e35cfa611bdcf2'
* commit 'c0d973c41b4568d5bad1295879e35cfa611bdcf2':
vdpau: use the correct namespace for the union
Conflicts:
libavcodec/vdpau.h
See: 68dfe530e0fb03b4d21dfe37f8a572b95c68485e
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0da0caa9a9ea1a2d7471f51a11fd90c08fbcd3fb
---
More information about the ffmpeg-cvslog
mailing list