Commit 4ecc9a2f authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'db21dde3'

* commit 'db21dde3':
  qsvdec_mpeg2: drop an incorrect comment

Conflicts:
	libavcodec/qsvdec_mpeg2.c

No change as the removed comment was not in libavcodec/qsvdec_mpeg2.c
Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parents 14673048 db21dde3
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