ffmpeg | branch: release/2.2 | Michael Niedermayer <[email protected]> | Sun Aug 
25 03:01:19 2013 +0200| [fa4604d80580dde45bfce32ebe04a5c13c233895] | committer: 
Anton Khirnov

h264: Do not share rbsp_buffer across threads

Signed-off-by: Luca Barbato <[email protected]>

CC: [email protected]
(cherry picked from commit 61928b68dc28e080b8c8191afe5541123c682bbd)
Signed-off-by: Anton Khirnov <[email protected]>
(cherry picked from commit 06d433366c02ab81a1aaad33d32934b4180d354b)
Signed-off-by: Anton Khirnov <[email protected]>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa4604d80580dde45bfce32ebe04a5c13c233895
---

 libavcodec/h264.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 3c07477..b2785de 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;

_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to