aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/bitstream_filter.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-06-29 03:39:03 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-06-29 03:39:03 +0200
commitb36b5edb8fea33ebcacc0b77ce412372dd9f79e4 (patch)
treee59dce1fce358455046102b32dfd332767dd25c3 /libavcodec/bitstream_filter.c
parent08f6fdc3e4bbda3837417fb20656165756e6ea87 (diff)
downloadandroid_external_ffmpeg-b36b5edb8fea33ebcacc0b77ce412372dd9f79e4.tar.gz
android_external_ffmpeg-b36b5edb8fea33ebcacc0b77ce412372dd9f79e4.tar.bz2
android_external_ffmpeg-b36b5edb8fea33ebcacc0b77ce412372dd9f79e4.zip
avcodec/bitstream_filter: make av_register_bitstream_filter() thread safe
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bitstream_filter.c')
-rw-r--r--libavcodec/bitstream_filter.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/bitstream_filter.c b/libavcodec/bitstream_filter.c
index 328a9f6a34..dd105316ee 100644
--- a/libavcodec/bitstream_filter.c
+++ b/libavcodec/bitstream_filter.c
@@ -21,6 +21,7 @@
#include <string.h>
#include "avcodec.h"
+#include "libavutil/atomic.h"
#include "libavutil/mem.h"
static AVBitStreamFilter *first_bitstream_filter= NULL;
@@ -31,8 +32,9 @@ AVBitStreamFilter *av_bitstream_filter_next(AVBitStreamFilter *f){
}
void av_register_bitstream_filter(AVBitStreamFilter *bsf){
- bsf->next = first_bitstream_filter;
- first_bitstream_filter= bsf;
+ do {
+ bsf->next = first_bitstream_filter;
+ } while(bsf->next != avpriv_atomic_ptr_cas((void * volatile *)&first_bitstream_filter, bsf->next, bsf));
}
AVBitStreamFilterContext *av_bitstream_filter_init(const char *name){