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@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-02-19 20:23:48 +01:00
4 changed files with 13 additions and 2 deletions

View File

@ -15,6 +15,9 @@ libavutil: 2014-08-09
API changes, most recent first:
2015-xx-xx - xxxxxxx - lavu 54.9.0
Add AV_PIX_FMT_QSV for QSV hardware acceleration.
2015-02-xx - xxxxxxx - lavc 56.21.102
Deprecate VIMA decoder.