diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 11:50:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 11:50:17 +0200 |
| commit | d12be9ed70f55e918ec852d2d4097a8fbdd36cb9 (patch) | |
| tree | b7af01a3850627465be0011a35e57e0a550091f6 | |
| parent | c719b7a42b3e5218304cc18858fde8c690ef4ecd (diff) | |
| parent | f3bd3810d274a7f51b5925fc3d2fc33e8043a5d4 (diff) | |
| download | ffmpeg-d12be9ed70f55e918ec852d2d4097a8fbdd36cb9.tar.gz | |
Merge commit 'f3bd3810d274a7f51b5925fc3d2fc33e8043a5d4'
* commit 'f3bd3810d274a7f51b5925fc3d2fc33e8043a5d4':
qsvdec_*: add missing CODEC_CAP_DR1
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/qsvdec_h2645.c | 4 | ||||
| -rw-r--r-- | libavcodec/qsvdec_mpeg2.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/qsvdec_h2645.c b/libavcodec/qsvdec_h2645.c index 20cb438bd0..38b972edf8 100644 --- a/libavcodec/qsvdec_h2645.c +++ b/libavcodec/qsvdec_h2645.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 diff --git a/libavcodec/qsvdec_mpeg2.c b/libavcodec/qsvdec_mpeg2.c index 2764a209bb..1385566786 100644 --- a/libavcodec/qsvdec_mpeg2.c +++ b/libavcodec/qsvdec_mpeg2.c @@ -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, }; |