[FFmpeg-cvslog] Merge commit '728c4658563dc82115ade0f1679679eddb7be5ff'

Michael Niedermayer git at videolan.org
Thu Nov 14 13:14:31 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 14 13:08:36 2013 +0100| [31c09b7663acdcc64031d6f251a667ce812f590f] | committer: Michael Niedermayer

Merge commit '728c4658563dc82115ade0f1679679eddb7be5ff'

* commit '728c4658563dc82115ade0f1679679eddb7be5ff':
  vdpau: add a constructor for AVVDPAUContext.

Conflicts:
	libavcodec/vdpau.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=31c09b7663acdcc64031d6f251a667ce812f590f
---





More information about the ffmpeg-cvslog mailing list