ffmpeg | branch: release/2.6 | Michael Niedermayer <michae...@gmx.at> | Tue Apr
7 02:47:36 2015 +0200| [3550d239a6cb2eb8ae2ecb1dc80247ef2f549601] | committer:
Michael Niedermayer
avcodec/h264: finish previous slices before switching to single thread mode
Fixes null pointer dereference
Fixes Ticket4438
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
(cherry picked from commit c4b2017ba66e1623da9f527704c61c86a6e74844)
Conflicts:
libavcodec/h264.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3550d239a6cb2eb8ae2ecb1dc80247ef2f549601
---
libavcodec/h264.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index e64cc07..6fa0b7b 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1680,6 +1680,12 @@ again:
av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header
error\n");
h->ref_count[0] = h->ref_count[1] = h->list_count = 0;
} else if (err == SLICE_SINGLETHREAD) {
+ if (context_count > 1) {
+ ret = ff_h264_execute_decode_slices(h, context_count - 1);
+ if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE))
+ goto end;
+ context_count = 0;
+ }
/* Slice could not be decoded in parallel mode, copy down
* NAL unit stuff to context 0 and restart. Note that
* rbsp_buffer is not transferred, but since we no longer
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
