[FFmpeg-cvslog] avcodec/parser: Make av_register_codec_parser() thread safe

Michael Niedermayer git at videolan.org
Sat Jun 29 03:35:49 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jun 29 03:24:32 2013 +0200| [08f6fdc3e4bbda3837417fb20656165756e6ea87] | committer: Michael Niedermayer

avcodec/parser: Make av_register_codec_parser() thread safe

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/parser.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index f7cb5cf..500bbb8 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -23,6 +23,7 @@
 #include <string.h>
 
 #include "parser.h"
+#include "libavutil/atomic.h"
 #include "libavutil/mem.h"
 
 static AVCodecParser *av_first_parser = NULL;
@@ -34,8 +35,9 @@ AVCodecParser* av_parser_next(AVCodecParser *p){
 
 void av_register_codec_parser(AVCodecParser *parser)
 {
-    parser->next = av_first_parser;
-    av_first_parser = parser;
+    do {
+        parser->next = av_first_parser;
+    } while (parser->next != avpriv_atomic_ptr_cas((void * volatile *)&av_first_parser, parser->next, parser));
 }
 
 AVCodecParserContext *av_parser_init(int codec_id)



More information about the ffmpeg-cvslog mailing list