Merge commit 'f3bd3810d274a7f51b5925fc3d2fc33e8043a5d4'

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

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
pull/161/head
Michael Niedermayer 10 years ago
commit d12be9ed70
  1. 4
      libavcodec/qsvdec_h2645.c
  2. 2
      libavcodec/qsvdec_mpeg2.c

@ -181,7 +181,7 @@ AVCodec ff_hevc_qsv_decoder = {
.decode = qsv_decode_frame,
.flush = qsv_decode_flush,
.close = qsv_decode_close,
.capabilities = CODEC_CAP_DELAY,
.capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1,
.priv_class = &hevc_class,
};
#endif
@ -216,7 +216,7 @@ AVCodec ff_h264_qsv_decoder = {
.decode = qsv_decode_frame,
.flush = qsv_decode_flush,
.close = qsv_decode_close,
.capabilities = CODEC_CAP_DELAY,
.capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1,
.priv_class = &class,
};
#endif

@ -90,6 +90,6 @@ AVCodec ff_mpeg2_qsv_decoder = {
.decode = qsv_decode_frame,
.flush = qsv_decode_flush,
.close = qsv_decode_close,
.capabilities = CODEC_CAP_DELAY,
.capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1,
.priv_class = &class,
};

Loading…
Cancel
Save