ffmpeg | branch: release/2.8 | Michael Niedermayer <mich...@niedermayer.cc> | Sat Oct 31 21:36:00 2015 +0100| [aa34146e41b74d1db42239d0860537f55fca95b9] | committer: Michael Niedermayer
avcodec/h264_slice: Disable slice threads if there are multiple access units in a packet Fixes null pointer dereference Fixes part of Ticket4977 Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> (cherry picked from commit 9368d2da3d33cac845f2fdf663df500b53625c5e) Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aa34146e41b74d1db42239d0860537f55fca95b9 --- libavcodec/h264_slice.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index a346ccb..9642dc5 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1177,6 +1177,15 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) av_log(h->avctx, AV_LOG_ERROR, "Too many fields\n"); return AVERROR_INVALIDDATA; } + if (h->max_contexts > 1) { + if (!h->single_decode_warning) { + av_log(h->avctx, AV_LOG_WARNING, "Cannot decode multiple access units as slice threads\n"); + h->single_decode_warning = 1; + } + h->max_contexts = 1; + return SLICE_SINGLETHREAD; + } + if (h->cur_pic_ptr && FIELD_PICTURE(h) && h->first_field) { ret = ff_h264_field_end(h, h->slice_ctx, 1); h->current_slice = 0; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
