[FFmpeg-cvslog] Merge commit '76eef04f30a768fa80366d679f3de7e9447b67d5'

James Almer git at videolan.org
Tue Sep 11 19:43:24 EEST 2018


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Sep 11 13:41:46 2018 -0300| [50ae1f7e0ff1fa00236622415039f7e28d919a25] | committer: James Almer

Merge commit '76eef04f30a768fa80366d679f3de7e9447b67d5'

* commit '76eef04f30a768fa80366d679f3de7e9447b67d5':
  qsvenc: Fix a misleading log message

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

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

 libavcodec/qsvenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index a8664541c8..10bb237863 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -1145,7 +1145,7 @@ static void print_interlace_msg(AVCodecContext *avctx, QSVEncContext *q)
             q->param.mfx.CodecLevel > MFX_LEVEL_AVC_41)
             av_log(avctx, AV_LOG_WARNING,
                    "Interlaced coding is supported"
-                   " at Main/High Profile Level 2.1-4.1\n");
+                   " at Main/High Profile Level 2.2-4.0\n");
     }
 }
 


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




More information about the ffmpeg-cvslog mailing list