diff options
Diffstat (limited to 'libavutil/atomic.c')
| -rw-r--r-- | libavutil/atomic.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavutil/atomic.c b/libavutil/atomic.c index 83740396d4..b13725d14f 100644 --- a/libavutil/atomic.c +++ b/libavutil/atomic.c @@ -1,20 +1,20 @@ /* * Copyright (c) 2012 Ronald S. Bultje <rsbultje@gmail.com> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -64,7 +64,7 @@ void *avpriv_atomic_ptr_cas(void * volatile *ptr, void *oldval, void *newval) void *ret; pthread_mutex_lock(&atomic_lock); ret = *ptr; - if (*ptr == oldval) + if (ret == oldval) *ptr = newval; pthread_mutex_unlock(&atomic_lock); return ret; @@ -109,7 +109,7 @@ void *avpriv_atomic_ptr_cas(void * volatile *ptr, void *oldval, void *newval) #endif /* !HAVE_ATOMICS_NATIVE */ #ifdef TEST -#include <assert.h> +#include "avassert.h" int main(void) { @@ -117,10 +117,10 @@ int main(void) int res; res = avpriv_atomic_int_add_and_fetch(&val, 1); - assert(res == 2); + av_assert0(res == 2); avpriv_atomic_int_set(&val, 3); res = avpriv_atomic_int_get(&val); - assert(res == 3); + av_assert0(res == 3); return 0; } |