diff options
author | Mark Thompson <sw@jkqxz.net> | 2017-03-12 15:21:41 +0000 |
---|---|---|
committer | Mark Thompson <sw@jkqxz.net> | 2017-03-12 15:21:41 +0000 |
commit | a7434ef19585f3af9ec168ec2db3db299f447285 (patch) | |
tree | 08fb000fa6c323c34839d1e014414238c912f9e8 /libavcodec/qsvenc.c | |
parent | 80fa5a0bcc13375711d9901f6ac7d8bdcc10a883 (diff) | |
parent | 8e07c22e508b349d145b9f142aa3ee8b3ce1d3a4 (diff) |
Merge commit '8e07c22e508b349d145b9f142aa3ee8b3ce1d3a4'
* commit '8e07c22e508b349d145b9f142aa3ee8b3ce1d3a4':
qsvenc: print warnings from encode/init
Merged-by: Mark Thompson <sw@jkqxz.net>
Diffstat (limited to 'libavcodec/qsvenc.c')
-rw-r--r-- | libavcodec/qsvenc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index a0ea965161..2e591507a2 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -784,6 +784,9 @@ int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q) if (ret < 0) return ff_qsv_print_error(avctx, ret, "Error initializing the encoder"); + else if (ret > 0) + ff_qsv_print_warning(avctx, ret, + "Warning in encoder initialization"); ret = qsv_retrieve_enc_params(avctx, q); if (ret < 0) { @@ -991,6 +994,9 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, av_usleep(500); } while (ret == MFX_WRN_DEVICE_BUSY || ret == MFX_WRN_IN_EXECUTION); + if (ret > 0) + ff_qsv_print_warning(avctx, ret, "Warning during encoding"); + if (ret < 0) { av_packet_unref(&new_pkt); av_freep(&bs); |