ffmpeg | branch: master | Hendrik Leppkes <[email protected]> | Fri Oct 7 13:19:32 2016 +0200| [5e872d908368e7a246f37e28df1f67e8c4fb08b9] | committer: Hendrik Leppkes
Merge commit '11b8030309ee93d79b3a6cd4b83bf00757db1598' * commit '11b8030309ee93d79b3a6cd4b83bf00757db1598': vaapi_encode: Fix fallback when input does not match any format Merged-by: Hendrik Leppkes <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5e872d908368e7a246f37e28df1f67e8c4fb08b9 --- libavcodec/vaapi_encode.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 8c9a3bd..21a8656 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -1114,8 +1114,11 @@ av_cold int ff_vaapi_encode_init(AVCodecContext *avctx, break; } } - if (recon_format == AV_PIX_FMT_NONE) - recon_format = constraints->valid_sw_formats[i]; + if (recon_format == AV_PIX_FMT_NONE) { + // No match. Just use the first in the supported list and + // hope for the best. + recon_format = constraints->valid_sw_formats[0]; + } } else { // No idea what to use; copy input format. recon_format = ctx->input_frames->sw_format; ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
