Merge commit '61928b68dc28e080b8c8191afe5541123c682bbd'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Jan 2015 21:41:39 +0000 (22:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Jan 2015 21:44:09 +0000 (22:44 +0100)
* commit '61928b68dc28e080b8c8191afe5541123c682bbd':
  h264: Do not share rbsp_buffer across threads

Conflicts:
libavcodec/h264.c

See: ecbf838c7d81ebd3b89fe75d83ff29150dbda27a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c

index be128adf68bb97f0f890a9acf2a72af16b42f578..35261d8804256e63f1980ebd09e578020a8b55f7 100644 (file)
@@ -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;