ffmpeg | branch: master | Nablet Developer <s...@nablet.com> | Wed Oct 5 09:34:25 2016 -0400| [8d858674fd1b114958c909065734b5df381ef356] | committer: Michael Niedermayer
avcodec/qsvenc_h264: fix segfault when a53 SEI is not available Signed-off-by: Nablet Developer <s...@nablet.com> Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d858674fd1b114958c909065734b5df381ef356 --- libavcodec/qsvenc_h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index c1f6003..f5b01bb 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -53,7 +53,7 @@ static int qsv_h264_set_encode_ctrl(AVCodecContext *avctx, int res; res = ff_alloc_a53_sei(frame, sizeof(mfxPayload) + 2, (void**)&payload, &sei_size); - if (res < 0) + if (res < 0 || !payload) return res; sei_data = (mfxU8*)(payload + 1); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
