Merge commit '1f156af4274dc72d588620f6bedb4e9e66023c92'

[ffmpeg] / libavutil / opt.c

diff --git a/libavutil/opt.c b/libavutil/opt.c
index a46797787ca5129e23a95d1597002b796ad5e85a..ca4edb827e0534fab414fb8843f1ec74ba173f15 100644 (file)
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -1183,7 +1183,7 @@ void av_opt_set_defaults2(void *s, int mask, int flags)
 {
 #endif
     const AVOption *opt = NULL;
-    while ((opt = av_opt_next(s, opt)) != NULL) {
+    while ((opt = av_opt_next(s, opt))) {
         void *dst = ((uint8_t*)s) + opt->offset;
 #if FF_API_OLD_AVOPTIONS
         if ((opt->flags & mask) != flags)