[FFmpeg-cvslog] h264: Do not share rbsp_buffer across threads

Michael Niedermayer git at videolan.org
Sat Feb 28 19:14:55 CET 2015


ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 25 03:01:19 2013 +0200| [06d433366c02ab81a1aaad33d32934b4180d354b] | committer: Anton Khirnov

h264: Do not share rbsp_buffer across threads

Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

CC: libav-stable at libav.org
(cherry picked from commit 61928b68dc28e080b8c8191afe5541123c682bbd)
Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=06d433366c02ab81a1aaad33d32934b4180d354b
---

 libavcodec/h264.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 208aa92..6dca22b 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -686,6 +686,10 @@ static int decode_init_thread_copy(AVCodecContext *avctx)
     memset(h->sps_buffers, 0, sizeof(h->sps_buffers));
     memset(h->pps_buffers, 0, sizeof(h->pps_buffers));
 
+    h->rbsp_buffer[0]      = NULL;
+    h->rbsp_buffer[1]      = NULL;
+    h->rbsp_buffer_size[0] = 0;
+    h->rbsp_buffer_size[1] = 0;
     h->context_initialized = 0;
 
     return 0;



More information about the ffmpeg-cvslog mailing list