Merge commit 'db21dde3f72c2331653399bdb8745350f015d847'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 22:13:14 +0000 (00:13 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 22:13:14 +0000 (00:13 +0200)
* commit 'db21dde3f72c2331653399bdb8745350f015d847':
  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: Michael Niedermayer <michael@niedermayer.cc>

Trivial merge