ff_formats_ref() takes a pointer to an AVFilterFormats and a pointer to
a pointer to an AVFilterFormats as arguments and adds the latter as an
owner to the list pointed to by the former; the latter is hereby always
the address of a list contained in an AVFilterFormatsConfig and can
therefore not be NULL. So remove the check for whether it is NULL; also
do the same for ff_channel_layouts_ref().
Also do the same for the unref functions where argument is never NULL
because it is always the address of an existing lvalue.
Signed-off-by: Andreas Rheinhardt
---
libavfilter/formats.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index 98ff82a887..43c90b9a27 100644
--- a/libavfilter/formats.c
+++ b/libavfilter/formats.c
@@ -269,7 +269,7 @@ do {\
do { \
int idx = -1; \
\
-if (!ref || !*ref) \
+if (!*ref) \
return;\
\
FIND_REF_INDEX(ref, idx); \
@@ -495,7 +495,7 @@ AVFilterChannelLayouts *ff_all_channel_counts(void)
#define FORMATS_REF(f, ref, unref_fn)
\
void *tmp;
\
\
-if (!f || !ref)
\
+if (!f)
\
return AVERROR(ENOMEM);
\
\
tmp = av_realloc_array(f->refs, sizeof(*f->refs), f->refcount + 1);
\
--
2.20.1
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
