Commit a822c3bd authored by Michael Niedermayer's avatar Michael Niedermayer

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: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parents 62aab839 96dca089
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment