-
Michael Niedermayer authored
* commit '202c2acc': vda: remove async decoder leftovers Conflicts: libavcodec/vda_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
a62fced3
* commit '202c2acc': vda: remove async decoder leftovers Conflicts: libavcodec/vda_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>