diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 13:53:42 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 13:53:42 +0200 |
| commit | 4554178f072ea1fad054381ba5ce3b48b5cf9280 (patch) | |
| tree | 3588b834122f84abfabbe712a5141d169f907ab6 /libavcodec | |
| parent | c36e85b3d9a13a223a621e7c322ce5903080cc4b (diff) | |
| parent | 741b352b16dad74b87c4a39bade8902633a2b0e6 (diff) | |
| download | ffmpeg-4554178f072ea1fad054381ba5ce3b48b5cf9280.tar.gz | |
Merge commit '741b352b16dad74b87c4a39bade8902633a2b0e6'
* commit '741b352b16dad74b87c4a39bade8902633a2b0e6':
qsvdec: list supported pixel formats
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/qsvdec_h2645.c | 6 | ||||
| -rw-r--r-- | libavcodec/qsvdec_mpeg2.c | 3 | ||||
| -rw-r--r-- | libavcodec/qsvdec_vc1.c | 3 |
3 files changed, 12 insertions, 0 deletions
diff --git a/libavcodec/qsvdec_h2645.c b/libavcodec/qsvdec_h2645.c index 2d787225b1..a396f31e88 100644 --- a/libavcodec/qsvdec_h2645.c +++ b/libavcodec/qsvdec_h2645.c @@ -183,6 +183,9 @@ AVCodec ff_hevc_qsv_decoder = { .close = qsv_decode_close, .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1, .priv_class = &hevc_class, + .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12, + AV_PIX_FMT_QSV, + AV_PIX_FMT_NONE }, }; #endif @@ -218,5 +221,8 @@ AVCodec ff_h264_qsv_decoder = { .close = qsv_decode_close, .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1, .priv_class = &class, + .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12, + AV_PIX_FMT_QSV, + AV_PIX_FMT_NONE }, }; #endif diff --git a/libavcodec/qsvdec_mpeg2.c b/libavcodec/qsvdec_mpeg2.c index 36fd3b07d2..d9052e0c62 100644 --- a/libavcodec/qsvdec_mpeg2.c +++ b/libavcodec/qsvdec_mpeg2.c @@ -94,4 +94,7 @@ AVCodec ff_mpeg2_qsv_decoder = { .close = qsv_decode_close, .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1, .priv_class = &class, + .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12, + AV_PIX_FMT_QSV, + AV_PIX_FMT_NONE }, }; diff --git a/libavcodec/qsvdec_vc1.c b/libavcodec/qsvdec_vc1.c index 3311d90f0f..fcf101f758 100644 --- a/libavcodec/qsvdec_vc1.c +++ b/libavcodec/qsvdec_vc1.c @@ -91,4 +91,7 @@ AVCodec ff_vc1_qsv_decoder = { .close = qsv_decode_close, .capabilities = AV_CODEC_CAP_DELAY, .priv_class = &class, + .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12, + AV_PIX_FMT_QSV, + AV_PIX_FMT_NONE }, }; |