-
Michael Niedermayer authored
* commit '5b1d9cee': pixfmt: add a pixel format for QSV hwaccel Conflicts: doc/APIchanges libavutil/pixfmt.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
e3755119
* commit '5b1d9cee': pixfmt: add a pixel format for QSV hwaccel Conflicts: doc/APIchanges libavutil/pixfmt.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>