]> git.sesse.net Git - ffmpeg/commit
avfilter/formats: Don't typedef structure a second time
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Thu, 10 Sep 2020 22:27:26 +0000 (00:27 +0200)
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Fri, 11 Sep 2020 12:51:03 +0000 (14:51 +0200)
commit5616942220a74d1e201d2eab9f022b0d0fa4c66d
tree0918fbea47d097042ed2af99bf6f1a5197ca64f9
parent0086432fc72f6671d23ca67ede7e8bc18af7124e
avfilter/formats: Don't typedef structure a second time

Before commit 2f76476549a01ae2c4ec2a440e4b14c5aba64869, avfilter.h
contained no typedef for AVFilterChannelLayouts; all references to it
were done using its struct tag. formats.h meanwhile contained the
definition of the struct and a typedef for it. Said commit now added a
typedef in avfilter.h, too, bringing it in line with AVFilterFormats;
yet this means that there are two typedefs for AVFilterChannelLayouts
(in contrast to AVFilterFormats which is only typedef'ed in avfilter.h).

The problem is that older versions of GCC don't like this and error out:
http://fate.ffmpeg.org/history.cgi?slot=x86_64-openbsd5.6-gcc4.2-conf2
is one of the FATE boxes that now fail to compile. So just remove the
typedef in formats.h.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
libavfilter/formats.h