Signed-off-by: Michael Niedermayer <[email protected]>
---
libavformat/format.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/libavformat/format.c b/libavformat/format.c
index 15fe167..f0abb5d 100644
--- a/libavformat/format.c
+++ b/libavformat/format.c
@@ -62,20 +62,24 @@ void av_register_input_format(AVInputFormat *format)
{
AVInputFormat **p = last_iformat;
- format->next = NULL;
- while(*p || avpriv_atomic_ptr_cas((void * volatile *)p, NULL, format))
+ // Note, format could be added after the first 2 checks but that implies
that *p is no longer NULL
+ while(p != &format->next && !format->next && avpriv_atomic_ptr_cas((void *
volatile *)p, NULL, format))
p = &(*p)->next;
- last_iformat = &format->next;
+
+ if (!format->next)
+ last_iformat = &format->next;
}
void av_register_output_format(AVOutputFormat *format)
{
AVOutputFormat **p = last_oformat;
- format->next = NULL;
- while(*p || avpriv_atomic_ptr_cas((void * volatile *)p, NULL, format))
+ // Note, format could be added after the first 2 checks but that implies
that *p is no longer NULL
+ while(p != &format->next && !format->next && avpriv_atomic_ptr_cas((void *
volatile *)p, NULL, format))
p = &(*p)->next;
- last_oformat = &format->next;
+
+ if (!format->next)
+ last_oformat = &format->next;
}
int av_match_ext(const char *filename, const char *extensions)
--
1.7.9.5
_______________________________________________
ffmpeg-devel mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
