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)
commit4ecc9a2f31bfafd5438558311f858ad4c7138214
tree649170b922ae4641f2519d9645db950d1a9256d2
parent146730480265dc2ce23f18a15b9edf2129b54185
parentdb21dde3f72c2331653399bdb8745350f015d847
Merge commit 'db21dde3f72c2331653399bdb8745350f015d847'

* 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>