[FFmpeg-cvslog] Merge commit '66e6c8a7b4e3ac926302529606bd3e323c28b20f'

Michael Niedermayer git at videolan.org
Mon May 12 00:58:00 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 12 00:37:12 2014 +0200| [14aef38a698229f12bbf980b4e45f2ee55edfcfe] | committer: Michael Niedermayer

Merge commit '66e6c8a7b4e3ac926302529606bd3e323c28b20f'

* commit '66e6c8a7b4e3ac926302529606bd3e323c28b20f':
  lavu: Add a pixel format for new VDA hwaccel

Conflicts:
	doc/APIchanges
	libavutil/pixfmt.h
	libavutil/version.h

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

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





More information about the ffmpeg-cvslog mailing list