[FFmpeg-cvslog] avcodec/h264: finish previous slices before switching to single thread mode
ffmpeg | branch: release/2.4 | Michael Niedermayer | Tue Apr
7 02:47:36 2015 +0200| [7493c54ad075920721c2b80a9b0d86cf02f41f4a] | 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
(cherry picked from commit c4b2017ba66e1623da9f527704c61c86a6e74844)
Conflicts:
libavcodec/h264.c
(cherry picked from commit 09cc7aee3f4d1bd1d7107d38520f782c62c14036)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7493c54ad075920721c2b80a9b0d86cf02f41f4a
---
libavcodec/h264.c |6 ++
1 file changed, 6 insertions(+)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 7b5c506..704c089 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1730,6 +1730,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
[FFmpeg-cvslog] avcodec/h264: finish previous slices before switching to single thread mode
ffmpeg | branch: release/2.5 | Michael Niedermayer | Tue Apr
7 02:47:36 2015 +0200| [7fa861dfe06ef184d8e2b3e2545b8890b36bf07e] | 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
(cherry picked from commit c4b2017ba66e1623da9f527704c61c86a6e74844)
Conflicts:
libavcodec/h264.c
(cherry picked from commit 09cc7aee3f4d1bd1d7107d38520f782c62c14036)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7fa861dfe06ef184d8e2b3e2545b8890b36bf07e
---
libavcodec/h264.c |6 ++
1 file changed, 6 insertions(+)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 88fc270..0dd71dd 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1736,6 +1736,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
[FFmpeg-cvslog] avcodec/h264: finish previous slices before switching to single thread mode
ffmpeg | branch: release/2.6 | Michael Niedermayer | 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
(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
[FFmpeg-cvslog] avcodec/h264: finish previous slices before switching to single thread mode
ffmpeg | branch: release/2.2 | Michael Niedermayer | Tue Apr
7 02:47:36 2015 +0200| [8f026e2b388a9638c8d4ae13c44e583626c71d5c] | 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
(cherry picked from commit c4b2017ba66e1623da9f527704c61c86a6e74844)
Conflicts:
libavcodec/h264.c
(cherry picked from commit 09cc7aee3f4d1bd1d7107d38520f782c62c14036)
Conflicts:
libavcodec/h264.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8f026e2b388a9638c8d4ae13c44e583626c71d5c
---
libavcodec/h264.c |6 ++
1 file changed, 6 insertions(+)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 30b20c9..61fd02f 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -5221,6 +5221,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 == 1) {
+if (context_count > 1) {
+ret = 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
[FFmpeg-cvslog] avcodec/h264: finish previous slices before switching to single thread mode
ffmpeg | branch: master | Michael Niedermayer | Tue Apr 7
02:47:36 2015 +0200| [c4b2017ba66e1623da9f527704c61c86a6e74844] | 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
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c4b2017ba66e1623da9f527704c61c86a6e74844
---
libavcodec/h264.c |6 ++
1 file changed, 6 insertions(+)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 5dd187d..b4c4cd9 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1674,6 +1674,12 @@ again:
av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header
error\n");
sl->ref_count[0] = sl->ref_count[1] = sl->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, restart. Note
* that rbsp_buffer is not transferred, but since we no longer
* run in parallel mode this should not be an issue. */
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
