[FFmpeg-cvslog] Merge commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a'

Michael Niedermayer git at videolan.org
Thu Feb 19 20:36:20 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 19 20:23:48 2015 +0100| [e3755119fae71c9e34b630679c2805fcf1c97e2c] | committer: Michael Niedermayer

Merge commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a'

* commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a':
  pixfmt: add a pixel format for QSV 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=e3755119fae71c9e34b630679c2805fcf1c97e2c
---





More information about the ffmpeg-cvslog mailing list