* commit '96dca089b19bf55293136277f5b081c56146e10e': qsvdec: move qsv_process_data() from qsvdec_h264 to the common code Conflicts: libavcodec/qsvdec.c libavcodec/qsvdec_h264.c No change as the parser code has been removed Merged-by: Michael Niedermayer <michael@niedermayer.cc>tags/n2.8