diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-28 22:41:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-28 22:44:09 +0100 |
| commit | 72db3c79dfddbeae82c540c785c680654a77b063 (patch) | |
| tree | 3ae65775b9bf3e328bfb7718ce938fed4301891f /libavcodec/h264.c | |
| parent | 58ed1528574f7e8bfa916b1e03b1406908ebc9f5 (diff) | |
| parent | 61928b68dc28e080b8c8191afe5541123c682bbd (diff) | |
Merge commit '61928b68dc28e080b8c8191afe5541123c682bbd'
* commit '61928b68dc28e080b8c8191afe5541123c682bbd':
h264: Do not share rbsp_buffer across threads
Conflicts:
libavcodec/h264.c
See: ecbf838c7d81ebd3b89fe75d83ff29150dbda27a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -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 be128adf68..35261d8804 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -724,8 +724,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; |