-
Michael Niedermayer authored
* commit '31a46750': vda: use hwaccel private data for internal bitstream buffer Conflicts: libavcodec/vda.h libavcodec/vda_h264.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
c6a683bf
* commit '31a46750': vda: use hwaccel private data for internal bitstream buffer Conflicts: libavcodec/vda.h libavcodec/vda_h264.c Merged-by:Michael Niedermayer <michaelni@gmx.at>