summaryrefslogtreecommitdiff
path: root/libavcodec/qsvenc.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-12-14 19:04:37 -0300
committerJames Almer <jamrial@gmail.com>2017-12-14 19:05:55 -0300
commit374f818bfbc5f7ad3a88f6a17770abb14abec4d1 (patch)
tree460eb0eaa23712634cb0eb45891618719fdca853 /libavcodec/qsvenc.c
parentb4718b76937a6677ce89866e06d929d778c57b64 (diff)
parent508378556631dc18d32247b4a4e35703758e1ca9 (diff)
Merge commit '508378556631dc18d32247b4a4e35703758e1ca9'
* commit '508378556631dc18d32247b4a4e35703758e1ca9': qsv: Support explicit lookahead downscaling Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/qsvenc.c')
-rw-r--r--libavcodec/qsvenc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index d44bec3313..fee2f9f0e8 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -599,6 +599,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
q->extco2.Trellis = q->trellis;
#endif
+#if QSV_HAVE_LA_DS
+ q->extco2.LookAheadDS = q->look_ahead_downsampling;
+#endif
+
#if QSV_HAVE_BREF_TYPE
#if FF_API_PRIVATE_OPT
FF_DISABLE_DEPRECATION_WARNINGS
@@ -615,10 +619,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
#endif
q->extparam_internal[q->nb_extparam_internal++] = (mfxExtBuffer *)&q->extco2;
-
-#if QSV_HAVE_LA_DS
- q->extco2.LookAheadDS = q->look_ahead_downsampling;
-#endif
}
#endif
}