projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1dbfaa3
)
h264: Do not share rbsp_buffer across threads
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 25 Aug 2013 01:01:19 +0000
(
03:01
+0200)
committer
Anton Khirnov
<anton@khirnov.net>
Sat, 21 Feb 2015 08:34:48 +0000
(09:34 +0100)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
CC: libav-stable@libav.org
(cherry picked from commit
61928b68dc28e080b8c8191afe5541123c682bbd
)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
libavcodec/h264.c
patch
|
blob
|
history
diff --git
a/libavcodec/h264.c
b/libavcodec/h264.c
index
208aa92
..
6dca22b
100644
(file)
--- 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;