diff options
| author | James Almer <jamrial@gmail.com> | 2017-04-13 17:27:43 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-04-13 17:27:43 -0300 |
| commit | 7d3bb052c8b9756e6fd40c32a88627dc58b0bc50 (patch) | |
| tree | 8c7e6e53c4f70496c54cb8f143103df5c818da9f /libavcodec/qsvdec_h2645.c | |
| parent | 27324825defa0d2458a33aa34046ccfcdeac9502 (diff) | |
| parent | 624aa8ab221cf34693f9a8c5ab67219cf560f2bb (diff) | |
| download | ffmpeg-7d3bb052c8b9756e6fd40c32a88627dc58b0bc50.tar.gz | |
Merge commit '624aa8ab221cf34693f9a8c5ab67219cf560f2bb'
* commit '624aa8ab221cf34693f9a8c5ab67219cf560f2bb':
build: Add missing Makefile entries and ifdefs for QSV hwaccels
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/qsvdec_h2645.c')
| -rw-r--r-- | libavcodec/qsvdec_h2645.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/qsvdec_h2645.c b/libavcodec/qsvdec_h2645.c index aa7aded4ff..ed250cc16d 100644 --- a/libavcodec/qsvdec_h2645.c +++ b/libavcodec/qsvdec_h2645.c @@ -228,14 +228,16 @@ static void qsv_decode_flush(AVCodecContext *avctx) #define OFFSET(x) offsetof(QSVH2645Context, x) #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM -#if CONFIG_HEVC_QSV_DECODER +#if CONFIG_HEVC_QSV_HWACCEL AVHWAccel ff_hevc_qsv_hwaccel = { .name = "hevc_qsv", .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_HEVC, .pix_fmt = AV_PIX_FMT_QSV, }; +#endif +#if CONFIG_HEVC_QSV_DECODER static const AVOption hevc_options[] = { { "async_depth", "Internal parallelization depth, the higher the value the higher the latency.", OFFSET(qsv.async_depth), AV_OPT_TYPE_INT, { .i64 = ASYNC_DEPTH_DEFAULT }, 0, INT_MAX, VD }, @@ -275,14 +277,16 @@ AVCodec ff_hevc_qsv_decoder = { }; #endif -#if CONFIG_H264_QSV_DECODER +#if CONFIG_H264_QSV_HWACCEL AVHWAccel ff_h264_qsv_hwaccel = { .name = "h264_qsv", .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_H264, .pix_fmt = AV_PIX_FMT_QSV, }; +#endif +#if CONFIG_H264_QSV_DECODER static const AVOption options[] = { { "async_depth", "Internal parallelization depth, the higher the value the higher the latency.", OFFSET(qsv.async_depth), AV_OPT_TYPE_INT, { .i64 = ASYNC_DEPTH_DEFAULT }, 0, INT_MAX, VD }, { NULL }, |