summaryrefslogtreecommitdiff
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-25 03:01:19 +0200
committerLuca Barbato <lu_zero@gentoo.org>2015-01-28 16:28:58 +0100
commit61928b68dc28e080b8c8191afe5541123c682bbd (patch)
tree5e0e24017194242ba3b7d47d0f772df41a0c2a0d /libavcodec/h264.c
parent3c18a7b18807de81566381a1bcbe9f6103c0296b (diff)
h264: Do not share rbsp_buffer across threads
Signed-off-by: Luca Barbato <lu_zero@gentoo.org> CC: libav-stable@libav.org
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index be0dca4959..c70b2595f5 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -685,6 +685,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;