ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d7aaeea5402c81c83960080c5e6086560a962419
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
