[FFmpeg-cvslog] Merge commit 'c220a60f92dde9c7c118fc4deddff5c1f617cda9'
Michael Niedermayer
git at videolan.org
Sat Dec 27 13:15:11 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 27 13:06:25 2014 +0100| [d7aaeea5402c81c83960080c5e6086560a962419] | committer: Michael Niedermayer
Merge commit 'c220a60f92dde9c7c118fc4deddff5c1f617cda9'
* commit 'c220a60f92dde9c7c118fc4deddff5c1f617cda9':
vdpau: add helper for surface chroma type and size
Conflicts:
libavcodec/vdpau.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d7aaeea5402c81c83960080c5e6086560a962419
---
More information about the ffmpeg-cvslog
mailing list