[FFmpeg-cvslog] Merge commit '7c65a76b16bc3a44f1592acde2176f187a058797'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Dec 14 18:46:10 2017 -0300| [f61cf0e4df52130c138ee55691409044ab2e9833] | committer: James Almer

Merge commit '7c65a76b16bc3a44f1592acde2176f187a058797'

* commit '7c65a76b16bc3a44f1592acde2176f187a058797':
  lavc/qsvenc: add error messeage if ICQ unsupported.

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f61cf0e4df52130c138ee55691409044ab2e9833
---

 libavcodec/qsvenc.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index 74d901973b..d44bec3313 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -287,6 +287,12 @@ static int select_rc_mode(AVCodecContext *avctx, QSVEncContext *q)
         return AVERROR(EINVAL);
     }
 
+    if (!want_qscale && avctx->global_quality > 0 && !QSV_HAVE_ICQ){
+        av_log(avctx, AV_LOG_ERROR,
+               "ICQ ratecontrol mode requested, but is not supported by this SDK version\n");
+        return AVERROR(ENOSYS);
+    }
+
     if (want_qscale) {
         rc_mode = MFX_RATECONTROL_CQP;
         rc_desc = "constant quantization parameter (CQP)";


======================================================================