Merge commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Feb 2015 19:23:48 +0000 (20:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Feb 2015 19:23:48 +0000 (20:23 +0100)
commite3755119fae71c9e34b630679c2805fcf1c97e2c
tree59f417c9cbac3e3c8028be8a950435018de2c4ec
parent65da611d3415dd859d92c00d59fecbb5bba68692
parent5b1d9ceec715846a58fe029bc3889ed6fa62436a
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>
doc/APIchanges
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h