diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-28 19:04:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-28 19:04:42 +0100 |
| commit | a22079b8193b3ce3119b4440a4972098cd141e4e (patch) | |
| tree | 3b2c0af78384115083f33ab930ab8f2dee3fc4dd | |
| parent | a8eb02da80dfc04fdc75e50db63e45075821c134 (diff) | |
| parent | 06d433366c02ab81a1aaad33d32934b4180d354b (diff) | |
| download | ffmpeg-a22079b8193b3ce3119b4440a4972098cd141e4e.tar.gz | |
Merge commit '06d433366c02ab81a1aaad33d32934b4180d354b' into release/2.4
* commit '06d433366c02ab81a1aaad33d32934b4180d354b':
h264: Do not share rbsp_buffer across threads
Conflicts:
libavcodec/h264.c
See: ecbf838c7d81ebd3b89fe75d83ff29150dbda27a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 438c43f613..e554e246c5 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -727,8 +727,8 @@ 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[0] = NULL; + h->rbsp_buffer[1] = NULL; h->rbsp_buffer_size[0] = 0; h->rbsp_buffer_size[1] = 0; h->context_initialized = 0; |