-
Michael Niedermayer authored
* commit '549294fb': vdpau: deprecate VDPAU codec capability Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
3b805dca
* commit '549294fb': vdpau: deprecate VDPAU codec capability Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>