diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-25 03:01:19 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-02-21 09:41:24 +0100 |
| commit | fa4604d80580dde45bfce32ebe04a5c13c233895 (patch) | |
| tree | 3c24b43ed44887deabbf462652a13fbaf7c74882 | |
| parent | 03fbb6ff3d28f639ea5a35aba3c6dca09c17225d (diff) | |
| download | ffmpeg-fa4604d80580dde45bfce32ebe04a5c13c233895.tar.gz | |
h264: Do not share rbsp_buffer across threads
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>
(cherry picked from commit 06d433366c02ab81a1aaad33d32934b4180d354b)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavcodec/h264.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 3c07477d39..b2785de240 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1642,6 +1642,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; |