Merge commit '96dca089'
* commit '96dca089': 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>
Showing
Please
register
or
sign in
to comment