* commit '67afcefb35932b420998f6f3fda46c7c85848a3f': lavc: Add new VDA hwaccel Conflicts: configure libavcodec/vda.h libavcodec/vda_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>