ffmpeg | branch: release/2.7 | Michael Niedermayer <mich...@niedermayer.cc> |
Sat Oct 31 21:36:00 2015 +0100| [ab6f4bc06433c57ca9b789a5853524b67301b548] |
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)
Conflicts:
libavcodec/h264_slice.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab6f4bc06433c57ca9b789a5853524b67301b548
---
libavcodec/h264_slice.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 968e3ec..10f4d77 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1159,6 +1159,15 @@ int ff_h264_decode_slice_header(H264Context *h,
H264SliceContext *sl)
if (first_mb_in_slice == 0) { // FIXME better field boundary detection
if (h->current_slice) {
+ 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) {
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
