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)
* commit 'f3bd3810d274a7f51b5925fc3d2fc33e8043a5d4':
  qsvdec_*: add missing CODEC_CAP_DR1

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

Simple merge
Simple merge