summaryrefslogtreecommitdiffstats
path: root/libavcodec/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2013-12-06 15:24:10 +0100
committerMichael Niedermayer <[email protected]>2013-12-24 01:05:47 +0100
commit66a9edfcf677f2673b5163f8008bdc7d0454074c (patch)
tree845edd94ea6a7acf0ca36ec378b01e06c330efb6 /libavcodec/utils.c
parenta9382fc15c15c0517e41db8a294afc4c7696ba19 (diff)
do O(1) instead of O(n) atomic operations in register functions
about 1ms faster startup time Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 133fbfc7811ffae7b97dd129fcd0b5e646742362) Signed-off-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r--libavcodec/utils.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 6609f20ef7..9acf7bd770 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -163,7 +163,8 @@ av_cold void avcodec_register(AVCodec *codec)
avcodec_init();
p = &first_avcodec;
codec->next = NULL;
- while(avpriv_atomic_ptr_cas((void * volatile *)p, NULL, codec))
+
+ while(*p || avpriv_atomic_ptr_cas((void * volatile *)p, NULL, codec))
p = &(*p)->next;
if (codec->init_static_data)
@@ -3013,7 +3014,7 @@ void av_register_hwaccel(AVHWAccel *hwaccel)
{
AVHWAccel **p = &first_hwaccel;
hwaccel->next = NULL;
- while(avpriv_atomic_ptr_cas((void * volatile *)p, NULL, hwaccel))
+ while(*p || avpriv_atomic_ptr_cas((void * volatile *)p, NULL, hwaccel))
p = &(*p)->next;
}