RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/formats: Remove pointless checks 

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.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-09-11 01:29:38 +02:00
parent 5616942220
commit 0963be71ec
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/formats.c
View File

@ -446,7 +446,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); \
@ -483,7 +483,7 @@ do { \
do { \
int idx = -1; \
\
if (!ref || !*ref) \
if (!*ref) \
return; \
\
FIND_REF_INDEX(ref, idx); \