[FFmpeg-cvslog] Merge commit '1b1094a19d9e41baf3253c83841f9e5343cecbd0'
Michael Niedermayer
git at videolan.org
Thu Mar 20 22:56:41 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 20 22:47:29 2014 +0100| [1ec295a5c52bfe9a604bfb2a74041672db058324] | committer: Michael Niedermayer
Merge commit '1b1094a19d9e41baf3253c83841f9e5343cecbd0'
* commit '1b1094a19d9e41baf3253c83841f9e5343cecbd0':
vdpau: switch ff_vdpau_get_surface_id from Picture to AVFrame
Conflicts:
libavcodec/vdpau_internal.h
libavcodec/vdpau_vc1.c
See: 2a37e560dccb81328f610c51e74ce6cc53f1a5c7
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ec295a5c52bfe9a604bfb2a74041672db058324
---
More information about the ffmpeg-cvslog
mailing list