summaryrefslogtreecommitdiff
path: root/libavcodec/qsvenc.c
diff options
context:
space:
mode:
authorZhong Li <zhong.li@intel.com>2019-03-27 19:33:37 +0800
committerZhong Li <zhong.li@intel.com>2019-03-28 21:50:01 +0800
commitb9a066ae23cbf488faf332cbfd101a3af5b77611 (patch)
tree6dc3d6be1589fa8391b8c00ef1e40283825ecbff /libavcodec/qsvenc.c
parent4131b0619c22cc0da29e95ea16b2970e2e3a566e (diff)
lavc/qsvenc: use the common option "trellis" of AVCodecContext
Signed-off-by: Zhong Li <zhong.li@intel.com>
Diffstat (limited to 'libavcodec/qsvenc.c')
-rw-r--r--libavcodec/qsvenc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index 9091772687..a6641f68fc 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -683,7 +683,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
#endif
#if QSV_HAVE_TRELLIS
- q->extco2.Trellis = q->trellis;
+ if (avctx->trellis >= 0)
+ q->extco2.Trellis = (avctx->trellis == 0) ? MFX_TRELLIS_OFF : (MFX_TRELLIS_I | MFX_TRELLIS_P | MFX_TRELLIS_B);
+ else
+ q->extco2.Trellis = MFX_TRELLIS_UNKNOWN;
#endif
#if QSV_VERSION_ATLEAST(1, 8)