Merge commit 'f3bd3810d274a7f51b5925fc3d2fc33e8043a5d4'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 09:50:12 +0000 (11:50 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 27 Jul 2015 09:50:17 +0000 (11:50 +0200)
commitd12be9ed70f55e918ec852d2d4097a8fbdd36cb9
treeb7af01a3850627465be0011a35e57e0a550091f6
parentc719b7a42b3e5218304cc18858fde8c690ef4ecd
parentf3bd3810d274a7f51b5925fc3d2fc33e8043a5d4
Merge commit 'f3bd3810d274a7f51b5925fc3d2fc33e8043a5d4'

* commit 'f3bd3810d274a7f51b5925fc3d2fc33e8043a5d4':
  qsvdec_*: add missing CODEC_CAP_DR1

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/qsvdec_h2645.c
libavcodec/qsvdec_mpeg2.c